[tor-commits] [tor-browser/tor-browser-60.0.1esr-8.0-1] Bug 1460645 - Avoid the thread_local keyword for MinGW and instead use __thread. r=froydnj, a=jcristau

[gk at torproject.org]

commit 38df603ab4b0fe9843e836b60512c4079ff15b27
Author: Tom Ritter <tom at mozilla.com>
Date:   Thu May 10 11:11:19 2018 -0500

    Bug 1460645 - Avoid the thread_local keyword for MinGW and instead use __thread. r=froydnj, a=jcristau
    
    MozReview-Commit-ID: 5RPwQVatThs
    
    --HG--
    extra : source : dae4adbf59b7261dd442f6a8e84beafa5ac25ec8
---
 mfbt/ThreadLocal.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mfbt/ThreadLocal.h b/mfbt/ThreadLocal.h
index 0fc2f13da61f..06ad3e9a07fb 100644
--- a/mfbt/ThreadLocal.h
+++ b/mfbt/ThreadLocal.h
@@ -237,7 +237,7 @@ ThreadLocal<T, Storage>::set(const T aValue)
   }
 }
 
-#if defined(XP_WIN) || defined(MACOSX_HAS_THREAD_LOCAL)
+#if (defined(XP_WIN) || defined(MACOSX_HAS_THREAD_LOCAL)) && !defined(__MINGW32__)
 #define MOZ_THREAD_LOCAL(TYPE) thread_local mozilla::detail::ThreadLocal<TYPE, mozilla::detail::ThreadLocalNativeStorage>
 #elif defined(HAVE_THREAD_TLS_KEYWORD)
 #define MOZ_THREAD_LOCAL(TYPE) __thread mozilla::detail::ThreadLocal<TYPE, mozilla::detail::ThreadLocalNativeStorage>