[Boost-commit] svn:boost r46219 - trunk/boost/thread/win32

From: anthony_at_[hidden]
Date: 2008-06-07 16:54:19

Author: anthonyw
Date: 2008-06-07 16:54:19 EDT (Sat, 07 Jun 2008)
New Revision: 46219
URL: http://svn.boost.org/trac/boost/changeset/46219

Log:
Don't try and use _interlockedbittestandset primitives if we don't know they're present
Text files modified: 
   trunk/boost/thread/win32/thread_primitives.hpp |     6 ++----                                  
   1 files changed, 2 insertions(+), 4 deletions(-)

Modified: trunk/boost/thread/win32/thread_primitives.hpp
==============================================================================
--- trunk/boost/thread/win32/thread_primitives.hpp	(original)
+++ trunk/boost/thread/win32/thread_primitives.hpp	2008-06-07 16:54:19 EDT (Sat, 07 Jun 2008)
@@ -281,8 +281,7 @@
     }
 }
 
-#if defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN)
-#if _MSC_VER>=1400
+#if defined(BOOST_MSVC) && (_MSC_VER>=1400)  && !defined(UNDER_CE)
 #if _MSC_VER==1400
 extern "C" unsigned char _interlockedbittestandset(long *a,long b);
 extern "C" unsigned char _interlockedbittestandreset(long *a,long b);
@@ -314,7 +313,7 @@
     }
 }
 #define BOOST_THREAD_BTS_DEFINED
-#elif defined(_M_IX86)
+#elif (defined(BOOST_MSVC) || defined(BOOST_INTEL_WIN)) && defined(_M_IX86)
 namespace boost
 {
     namespace detail
@@ -346,7 +345,6 @@
 }
 #define BOOST_THREAD_BTS_DEFINED
 #endif
-#endif
 
 #ifndef BOOST_THREAD_BTS_DEFINED