diff options
| author | Brian Smith <brian@dbsoft.org> | 2022-04-26 10:13:11 -0500 |
|---|---|---|
| committer | Brian Smith <brian@dbsoft.org> | 2022-04-26 10:19:04 -0500 |
| commit | 3daf711085889bad1bd68651bc4e8790412ae105 (patch) | |
| tree | f5b0e4c1befb320cdf158e1839ac5e273373087f /mfbt | |
| parent | 7fe702603066e7f122d5dd66a3a1892ac7e06215 (diff) | |
| download | uxp-3daf711085889bad1bd68651bc4e8790412ae105.tar.gz | |
Issue #1829 - Revert “Issue #1751 -- Remove XP_MACOSX conditionals from the rest of the tree.”
This also removes some PP abuse and takes file entries out of PP when no longer
needed without XP_MACOSX conditionals.
This reverts commit 6f707bde95dab6998ac204f9ee6c925ee230c740.
Diffstat (limited to 'mfbt')
| -rw-r--r-- | mfbt/ThreadLocal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mfbt/ThreadLocal.h b/mfbt/ThreadLocal.h index 9466630c30..7acfa46548 100644 --- a/mfbt/ThreadLocal.h +++ b/mfbt/ThreadLocal.h @@ -30,7 +30,7 @@ typedef sig_atomic_t sig_safe_t; namespace detail { -#if defined(HAVE_THREAD_TLS_KEYWORD) || defined(XP_WIN) +#if defined(HAVE_THREAD_TLS_KEYWORD) || defined(XP_WIN) || defined(XP_MACOSX) #define MOZ_HAS_THREAD_LOCAL #endif @@ -180,7 +180,7 @@ ThreadLocal<T>::set(const T aValue) } #ifdef MOZ_HAS_THREAD_LOCAL -#if defined(XP_WIN) +#if defined(XP_WIN) || defined(XP_MACOSX) #define MOZ_THREAD_LOCAL(TYPE) thread_local mozilla::detail::ThreadLocal<TYPE> #else #define MOZ_THREAD_LOCAL(TYPE) __thread mozilla::detail::ThreadLocal<TYPE> |