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/glue/nsDebug.h | |
| 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/glue/nsDebug.h')
| -rw-r--r-- | xpcom/glue/nsDebug.h | 2 |
1 files changed, 1 insertions, 1 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 |