Fixed MinGW incompatibility
authorkhizmax <khizmax@gmail.com>
Tue, 17 Feb 2015 13:18:56 +0000 (16:18 +0300)
committerkhizmax <khizmax@gmail.com>
Tue, 17 Feb 2015 13:18:56 +0000 (16:18 +0300)
src/init.cpp

index 6fc930891804ff1f626e755337f6e7be08679c6d..ca9fa307ca55363ca17f57b6ac31cd2c318ead82 100644 (file)
@@ -24,12 +24,12 @@ namespace cds {
     CDS_EXPORT_API atomics::atomic<size_t> threading::ThreadData::s_nLastUsedProcNo(0);
     CDS_EXPORT_API size_t threading::ThreadData::s_nProcCount = 1;
 
-#if CDS_OS_INTERFACE == CDS_OSI_WINDOWS && CDS_OS_TYPE != CDS_OS_MINGW
+#if CDS_OS_INTERFACE == CDS_OSI_WINDOWS
     CDS_EXPORT_API DWORD cds::threading::wintls::Manager::Holder::m_key = TLS_OUT_OF_INDEXES;
-
-    __declspec( thread ) threading::msvc_internal::ThreadDataPlaceholder threading::msvc_internal::s_threadData;
-    __declspec(thread) threading::ThreadData * threading::msvc_internal::s_pThreadData = nullptr;
-
+#   if CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL
+        __declspec( thread ) threading::msvc_internal::ThreadDataPlaceholder threading::msvc_internal::s_threadData;
+        __declspec(thread) threading::ThreadData * threading::msvc_internal::s_pThreadData = nullptr;
+#   endif
 #else
     pthread_key_t threading::pthread::Manager::Holder::m_key;