From bd57d776e3b3c59b3f3b242e93c2904c54039299 Mon Sep 17 00:00:00 2001 From: khizmax Date: Thu, 5 Feb 2015 14:33:03 +0300 Subject: [PATCH] Fix TDM-GCC incompatibility --- src/init.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index 40243613..6fc93089 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -3,7 +3,7 @@ #include #include -#if CDS_OS_INTERFACE == CDS_OSI_WINDOWS +#if CDS_OS_INTERFACE == CDS_OSI_WINDOWS && CDS_OS_TYPE != CDS_OS_MINGW # if CDS_COMPILER == CDS_COMPILER_MSVC || CDS_COMPILER == CDS_COMPILER_INTEL # include # endif @@ -24,7 +24,7 @@ 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 +#if CDS_OS_INTERFACE == CDS_OSI_WINDOWS && CDS_OS_TYPE != CDS_OS_MINGW 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; -- 2.34.1