From d6901a75b54465962c5b0d25e6dd73c9389a5b57 Mon Sep 17 00:00:00 2001 From: khizmax Date: Tue, 17 Feb 2015 16:18:56 +0300 Subject: [PATCH] Fixed MinGW incompatibility --- src/init.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 6fc93089..ca9fa307 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -24,12 +24,12 @@ namespace cds { CDS_EXPORT_API atomics::atomic 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; -- 2.34.1