diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /mfbt/ThreadLocal.h | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mfbt/ThreadLocal.h')
| -rw-r--r-- | mfbt/ThreadLocal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mfbt/ThreadLocal.h b/mfbt/ThreadLocal.h index 55c9fbcac6..891b2cdd5d 100644 --- a/mfbt/ThreadLocal.h +++ b/mfbt/ThreadLocal.h @@ -240,7 +240,7 @@ inline void ThreadLocal<T, Storage>::set(const T aValue) { # define MOZ_THREAD_LOCAL(TYPE) \ thread_local ::mozilla::detail::ThreadLocal< \ TYPE, ::mozilla::detail::ThreadLocalNativeStorage> -#elif defined(HAVE_THREAD_TLS_KEYWORD) +#elif defined(HAVE_THREAD_TLS_KEYWORD) && !defined(MOZ_LINKER) # define MOZ_THREAD_LOCAL(TYPE) \ __thread ::mozilla::detail::ThreadLocal< \ TYPE, ::mozilla::detail::ThreadLocalNativeStorage> |