diff options
author | Brian Smith <brian@dbsoft.org> | 2022-04-28 20:27:47 -0500 |
---|---|---|
committer | Brian Smith <brian@dbsoft.org> | 2022-04-28 20:27:47 -0500 |
commit | d78e03d528ba9e7395160a23bce23726067600dd (patch) | |
tree | e8314f3d55f136a6db6bb9e2a035ae68a04dc3e9 /xpcom | |
parent | bebeb4e26a35df99e19b6c44fc957ad6c14e9059 (diff) | |
parent | 33523f5d5ed0c3b8000aae21a50a56c238422db3 (diff) | |
download | uxp-d78e03d528ba9e7395160a23bce23726067600dd.tar.gz |
Merge branch 'master' into 1829
* master:
No issue - Update README and SECURITY
Issue #1885 - Follow-up: Update error message if invalid rootMargin specified.
Issue #1879 - Follow-up: Update config/external/nss/target to security/target.
Issue #1885 - Allow unitless rootMargin entries for IntersectionObserver.
Issue #1879 - Revert changes to cryptox.h
Revert "Issue #1879 - spot-fix typo in cryptox.h"
Issue #1879 - spot-fix typo in cryptox.h
Issue #21 - Change MappedAttrParser to store its nsIPrincipal instead of nsSVGElement
Issue #21 - Remove use counters telemetry
Issue #1881 - Interpret empty or whitespace root margin string as zero length
Issue #1877 - Resolve NIGHTLY_BUILD conditionals.
Issue #1880 - Boot Comic Sans out of the font configuration.
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 |