diff options
| author | Moonchild <moonchild@palemoon.org> | 2022-02-04 01:44:41 +0000 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-04-19 17:38:02 +0000 |
| commit | 185a027640f9b18c97eda39a49bfa2dcce58fcdb (patch) | |
| tree | d29b146d37f0f831ec981316da778c91fd77be8a /ipc | |
| parent | 99ec088ecf1259643f6124206af024de3ebc49ad (diff) | |
| download | uxp-185a027640f9b18c97eda39a49bfa2dcce58fcdb.tar.gz | |
Issue #1877 - Resolve RELEASE_OR_BETA conditionals.
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/chromium/src/base/pickle.h | 2 | ||||
| -rw-r--r-- | ipc/glue/BackgroundImpl.cpp | 14 |
2 files changed, 4 insertions, 12 deletions
diff --git a/ipc/chromium/src/base/pickle.h b/ipc/chromium/src/base/pickle.h index b0e607a558..3d197c1c6b 100644 --- a/ipc/chromium/src/base/pickle.h +++ b/ipc/chromium/src/base/pickle.h @@ -21,7 +21,7 @@ #include "mozilla/ipc/Faulty.h" #endif -#if !defined(RELEASE_OR_BETA) || defined(DEBUG) +#if defined(DEBUG) #define MOZ_PICKLE_SENTINEL_CHECKING #endif diff --git a/ipc/glue/BackgroundImpl.cpp b/ipc/glue/BackgroundImpl.cpp index 4c65cc851d..34df00d94f 100644 --- a/ipc/glue/BackgroundImpl.cpp +++ b/ipc/glue/BackgroundImpl.cpp @@ -45,11 +45,7 @@ #include "nsXPCOMPrivate.h" #include "prthread.h" -#ifdef RELEASE_OR_BETA #define THREADSAFETY_ASSERT MOZ_ASSERT -#else -#define THREADSAFETY_ASSERT MOZ_RELEASE_ASSERT -#endif #define CRASH_IN_CHILD_PROCESS(_msg) \ do { \ @@ -331,7 +327,7 @@ class ChildImpl final : public BackgroundChildImpl // create the background thread after application shutdown has started. static bool sShutdownHasStarted; -#if defined(DEBUG) || !defined(RELEASE_OR_BETA) +#if defined(DEBUG) nsIThread* mBoundThread; #endif @@ -351,11 +347,7 @@ public: { THREADSAFETY_ASSERT(mBoundThread); -#ifdef RELEASE_OR_BETA DebugOnly<bool> current; -#else - bool current; -#endif THREADSAFETY_ASSERT( NS_SUCCEEDED(mBoundThread->IsOnCurrentThread(¤t))); THREADSAFETY_ASSERT(current); @@ -368,7 +360,7 @@ public: } ChildImpl() -#if defined(DEBUG) || !defined(RELEASE_OR_BETA) +#if defined(DEBUG) : mBoundThread(nullptr) #endif #ifdef DEBUG @@ -449,7 +441,7 @@ private: { THREADSAFETY_ASSERT(!mBoundThread); -#if defined(DEBUG) || !defined(RELEASE_OR_BETA) +#if defined(DEBUG) mBoundThread = NS_GetCurrentThread(); #endif |