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/Makefile.in

@@ -63,15 +63,11 @@ EXTRA_COMPONENTS = nsSample.js
 
 # seperate libraries linked in.
 EXTRA_DSO_LDOPTS = \
-		$(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)string_obsolete_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
 LIBS            = \
-		$(DIST)/lib/$(LIB_PREFIX)string_s.$(LIB_SUFFIX) \
-		$(DIST)/lib/$(LIB_PREFIX)string_obsolete_s.$(LIB_SUFFIX) \
 		$(DIST)/lib/$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
 		$(NSPR_LIBS) \
 		$(NULL)

xpcom/sample/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"