diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-02-20 22:00:59 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-22 13:58:16 +0000 |
| commit | 5aa65d2aeab36ea8de8129c0babcf70a5e4e662a (patch) | |
| tree | 36ed652ffb09104d8a10c01261b851329f34882f /xpcom | |
| parent | 712ca7303b0835772f8abca85ebec981e254a017 (diff) | |
| download | uxp-5aa65d2aeab36ea8de8129c0babcf70a5e4e662a.tar.gz | |
Issue #1877 - Resolve NIGHTLY_BUILD conditionals.
Diffstat (limited to 'xpcom')
| -rw-r--r-- | xpcom/glue/nsDebug.h | 2 | ||||
| -rw-r--r-- | xpcom/glue/nsISupportsImpl.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/xpcom/glue/nsDebug.h b/xpcom/glue/nsDebug.h index 8921d60214..eca36c5137 100644 --- a/xpcom/glue/nsDebug.h +++ b/xpcom/glue/nsDebug.h @@ -355,7 +355,7 @@ inline void MOZ_PretendNoReturn() /*****************************************************************************/ -#if (defined(DEBUG) || (defined(NIGHTLY_BUILD) && !defined(MOZ_PROFILING))) && !defined(XPCOM_GLUE_AVOID_NSPR) +#if defined(DEBUG) && !defined(XPCOM_GLUE_AVOID_NSPR) #define MOZ_THREAD_SAFETY_OWNERSHIP_CHECKS_SUPPORTED 1 #endif diff --git a/xpcom/glue/nsISupportsImpl.h b/xpcom/glue/nsISupportsImpl.h index 66c4ad6d85..8c75cbe643 100644 --- a/xpcom/glue/nsISupportsImpl.h +++ b/xpcom/glue/nsISupportsImpl.h @@ -64,13 +64,13 @@ private: #define NS_ASSERT_OWNINGTHREAD_AGGREGATE(agg, _class) \ NS_CheckThreadSafe(agg->_mOwningThread.GetThread(), #_class " not thread-safe") #define NS_ASSERT_OWNINGTHREAD(_class) NS_ASSERT_OWNINGTHREAD_AGGREGATE(this, _class) -#else // !DEBUG && !(NIGHTLY_BUILD && !MOZ_PROFILING) +#else // !DEBUG #define NS_DECL_OWNINGTHREAD /* nothing */ #define NS_ASSERT_OWNINGTHREAD_AGGREGATE(agg, _class) ((void)0) #define NS_ASSERT_OWNINGTHREAD(_class) ((void)0) -#endif // DEBUG || (NIGHTLY_BUILD && !MOZ_PROFILING) +#endif // DEBUG // Macros for reference-count and constructor logging |