Fix bustage from previous checkin for bug 392055. Move #define of XPCOM_GLUE_AVOID_NSPR from nsISupportsImpl.h to nscore.h. r/a=bsmedberg

xpcom/base/nscore.h

@@ -460,6 +460,15 @@ typedef PRUint32 nsrefcnt;
 #else
 #define NS_LIKELY(x)    (!!(x))
 #define NS_UNLIKELY(x)  (!!(x))
+#endif
+
+ /*
+  * If we're being linked as standalone glue, we don't want a dynamic dependency
+  * on NSPR libs, so we skip the debug thread-safety checks, and we cannot use
+  * the THREADSAFE_ISUPPORTS macros.
+  */
+#if defined(XPCOM_GLUE) && !defined(XPCOM_GLUE_USE_NSPR)
+#define XPCOM_GLUE_AVOID_NSPR
 #endif
 
 #endif /* nscore_h___ */

xpcom/glue/nsISupportsImpl.h

@@ -50,15 +50,6 @@
 #include "nsISupportsUtils.h"
 #endif
 
-#if defined(XPCOM_GLUE) && !defined(XPCOM_GLUE_USE_NSPR)
-// If we're being linked as standalone glue, we don't want a dynamic dependency
-// on NSPR libs, so we skip the debug thread-safety checks, and we cannot use
-// the THREADSAFE_ISUPPORTS macros.
-
-#define XPCOM_GLUE_AVOID_NSPR
-
-#endif
-
 
 #if !defined(XPCOM_GLUE_AVOID_NSPR)
 #include "prthread.h" /* needed for thread-safety checks */