Browse Source

Disable i386 atomics impl on Mac OS X until we find out why it won't compile

rdb 10 years ago
parent
commit
af0d853eef

+ 1 - 1
dtool/src/dtoolbase/atomicAdjust.h

@@ -31,7 +31,7 @@ struct AtomicAdjust {
 #include "atomicAdjustDummyImpl.h"
 #include "atomicAdjustDummyImpl.h"
 typedef AtomicAdjustDummyImpl AtomicAdjust;
 typedef AtomicAdjustDummyImpl AtomicAdjust;
 
 
-#elif defined(__i386__) || defined(_M_IX86)
+#elif (defined(__i386__) || defined(_M_IX86)) && !defined(__APPLE__)
 // For an i386 architecture, we'll always use the i386 implementation.
 // For an i386 architecture, we'll always use the i386 implementation.
 // It should be safe for any OS, and it might be a bit faster than
 // It should be safe for any OS, and it might be a bit faster than
 // any OS-provided calls.
 // any OS-provided calls.

+ 0 - 6
dtool/src/dtoolbase/atomicAdjustI386Impl.cxx

@@ -12,10 +12,4 @@
 //
 //
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 
 
-#include "selectThreadImpl.h"
-
-#ifdef __i386__
-
 #include "atomicAdjustI386Impl.h"
 #include "atomicAdjustI386Impl.h"
-
-#endif  // __i386__

+ 1 - 1
dtool/src/dtoolbase/atomicAdjustI386Impl.h

@@ -18,7 +18,7 @@
 #include "dtoolbase.h"
 #include "dtoolbase.h"
 #include "selectThreadImpl.h"
 #include "selectThreadImpl.h"
 
 
-#if defined(__i386__) || defined(_M_IX86)
+#if (defined(__i386__) || defined(_M_IX86)) && !defined(__APPLE__)
 
 
 #include "numeric_types.h"
 #include "numeric_types.h"