From b68bf96776764ff6b8a857e83eef5034f6b55fa6 Mon Sep 17 00:00:00 2001
From: "dougt%netscape.com" <dougt%netscape.com>
Date: Wed, 29 Jun 2005 18:32:48 +0000
Subject: [PATCH] Final fix.  This is the way this patch should have landed.
 including nsXPIDLCString when XPCOM_GLUE is defined is not a good idea

---
 xpcom/sample/program/nsTestSample.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xpcom/sample/program/nsTestSample.cpp b/xpcom/sample/program/nsTestSample.cpp
index e1e927a31806..1ab6dac10f38 100644
--- a/xpcom/sample/program/nsTestSample.cpp
+++ b/xpcom/sample/program/nsTestSample.cpp
@@ -46,12 +46,13 @@
 
 #include "nsISample.h"
 #include "nsIServiceManager.h"
-#include "nsXPIDLString.h"
 #include "nsIComponentRegistrar.h"
 
 #ifdef XPCOM_GLUE
 #include "nsXPCOMGlue.h"
 #include "nsMemory.h"
+#else
+#include "nsXPIDLString.h"
 #endif
 
 #define NS_SAMPLE_CONTRACTID "@mozilla.org/sample;1"