TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rdb 2015-03-31 13:54:38 +02:00
parent 93e8d4d5f5
commit af0d853eef
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dtool/src/dtoolbase/atomicAdjust.h
View File

@ -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.

6
dtool/src/dtoolbase/atomicAdjustI386Impl.cxx
View File

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

2
dtool/src/dtoolbase/atomicAdjustI386Impl.h
View File

@ -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"