File boost-1.54.0-interlocked.patch of Package mingw32-boost

Overview Repositories Revisions Requests Users Attributes Meta

File boost-1.54.0-interlocked.patch of Package mingw32-boost (Revision 68d19341b08f7618e87c91169eea5f07)

Currently displaying revision 68d19341b08f7618e87c91169eea5f07 , Show latest

--- boost/detail/interlocked.hpp	2013-03-09 23:55:05.000000000 +0100
+++ boost/detail/interlocked.hpp	2014-06-03 13:40:05.150236889 +0200
@@ -125,14 +125,30 @@
 # define BOOST_INTERLOCKED_EXCHANGE _InterlockedExchange
 # define BOOST_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd
 
-#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
+// Unlike __MINGW64__, __MINGW64_VERSION_MAJOR is defined by MinGW-w64 for both 32 and 64-bit targets.
+#elif defined(__MINGW64_VERSION_MAJOR)
+
+// MinGW-w64 provides intrin.h for both 32 and 64-bit targets.
+#include <intrin.h>
 
-#if defined(__MINGW64__)
-#define BOOST_INTERLOCKED_IMPORT
+# define BOOST_INTERLOCKED_INCREMENT _InterlockedIncrement
+# define BOOST_INTERLOCKED_DECREMENT _InterlockedDecrement
+# define BOOST_INTERLOCKED_COMPARE_EXCHANGE _InterlockedCompareExchange
+# define BOOST_INTERLOCKED_EXCHANGE _InterlockedExchange
+# define BOOST_INTERLOCKED_EXCHANGE_ADD _InterlockedExchangeAdd
+# if defined(__x86_64__) || defined(__x86_64)
+#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER _InterlockedCompareExchangePointer
+#  define BOOST_INTERLOCKED_EXCHANGE_POINTER _InterlockedExchangePointer
 #else
-#define BOOST_INTERLOCKED_IMPORT __declspec(dllimport)
+#  define BOOST_INTERLOCKED_COMPARE_EXCHANGE_POINTER(dest,exchange,compare) \
+    ((void*)BOOST_INTERLOCKED_COMPARE_EXCHANGE((long volatile*)(dest),(long)(exchange),(long)(compare)))
+#  define BOOST_INTERLOCKED_EXCHANGE_POINTER(dest,exchange) \
+    ((void*)BOOST_INTERLOCKED_EXCHANGE((long volatile*)(dest),(long)(exchange)))
 #endif
 
+#elif defined( WIN32 ) || defined( _WIN32 ) || defined( __WIN32__ ) || defined( __CYGWIN__ )
+
+#define BOOST_INTERLOCKED_IMPORT __declspec(dllimport)
 
 namespace boost
 {

Places

File boost-1.54.0-interlocked.patch of Package mingw32-boost (Revision 68d19341b08f7618e87c91169eea5f07)

Places