From af0d853eefb14d02f02e25c99cf71639b58db452 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 31 Mar 2015 13:54:38 +0200
Subject: [PATCH] Disable i386 atomics impl on Mac OS X until we find out why
 it won't compile

---
 dtool/src/dtoolbase/atomicAdjust.h           | 2 +-
 dtool/src/dtoolbase/atomicAdjustI386Impl.cxx | 6 ------
 dtool/src/dtoolbase/atomicAdjustI386Impl.h   | 2 +-
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dtool/src/dtoolbase/atomicAdjust.h b/dtool/src/dtoolbase/atomicAdjust.h
index bd709fce20..cbaa2bcf7f 100644
--- a/dtool/src/dtoolbase/atomicAdjust.h
+++ b/dtool/src/dtoolbase/atomicAdjust.h
@@ -31,7 +31,7 @@ struct AtomicAdjust {
 #include "atomicAdjustDummyImpl.h"
 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.
 // It should be safe for any OS, and it might be a bit faster than
 // any OS-provided calls.
diff --git a/dtool/src/dtoolbase/atomicAdjustI386Impl.cxx b/dtool/src/dtoolbase/atomicAdjustI386Impl.cxx
index b564a27fbe..ee0cccd6fd 100644
--- a/dtool/src/dtoolbase/atomicAdjustI386Impl.cxx
+++ b/dtool/src/dtoolbase/atomicAdjustI386Impl.cxx
@@ -12,10 +12,4 @@
 //
 ////////////////////////////////////////////////////////////////////
 
-#include "selectThreadImpl.h"
-
-#ifdef __i386__
-
 #include "atomicAdjustI386Impl.h"
-
-#endif  // __i386__
diff --git a/dtool/src/dtoolbase/atomicAdjustI386Impl.h b/dtool/src/dtoolbase/atomicAdjustI386Impl.h
index 600aea7781..e234a47e31 100644
--- a/dtool/src/dtoolbase/atomicAdjustI386Impl.h
+++ b/dtool/src/dtoolbase/atomicAdjustI386Impl.h
@@ -18,7 +18,7 @@
 #include "dtoolbase.h"
 #include "selectThreadImpl.h"
 
-#if defined(__i386__) || defined(_M_IX86)
+#if (defined(__i386__) || defined(_M_IX86)) && !defined(__APPLE__)
 
 #include "numeric_types.h"