Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2022-05-04 11:44:06 +08:00
commit 6e56af69bb

View file

@ -210,10 +210,11 @@ ThreadLocal<T>::set(const T aValue)
} }
#ifdef MOZ_HAS_THREAD_LOCAL #ifdef MOZ_HAS_THREAD_LOCAL
#if defined(XP_MACOSX) # if defined(XP_MACOSX)
#define MOZ_THREAD_LOCAL(TYPE) thread_local mozilla::detail::ThreadLocal<TYPE> #define MOZ_THREAD_LOCAL(TYPE) thread_local mozilla::detail::ThreadLocal<TYPE>
#else # else
#define MOZ_THREAD_LOCAL(TYPE) __thread mozilla::detail::ThreadLocal<TYPE> #define MOZ_THREAD_LOCAL(TYPE) __thread mozilla::detail::ThreadLocal<TYPE>
# endif
#else #else
#define MOZ_THREAD_LOCAL(TYPE) mozilla::detail::ThreadLocal<TYPE> #define MOZ_THREAD_LOCAL(TYPE) mozilla::detail::ThreadLocal<TYPE>
#endif #endif