From f7413d87e3a5aa9f76598a7d83d1518bd7fdc429 Mon Sep 17 00:00:00 2001 From: "jag@tty.nl" Date: Fri, 28 Sep 2007 13:33:32 -0700 Subject: [PATCH] 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 | 9 +++++++++ xpcom/glue/nsISupportsImpl.h | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/xpcom/base/nscore.h b/xpcom/base/nscore.h index 7e01a4d682c0..7329fd11a703 100644 --- a/xpcom/base/nscore.h +++ b/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___ */ diff --git a/xpcom/glue/nsISupportsImpl.h b/xpcom/glue/nsISupportsImpl.h index 9d1c766011fc..663d916d6af0 100644 --- a/xpcom/glue/nsISupportsImpl.h +++ b/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 */