Fix SGAtomic mutex logic.

diff --git a/simgear/structure/SGAtomic.cxx b/simgear/structure/SGAtomic.cxx
index 68fcf7757b2c81ddc621f0bd86758fbc7499905a..71f24ed96eec87d472df866fb18ba5caafc2a447 100644 (file)
--- a/simgear/structure/SGAtomic.cxx
+++ b/simgear/structure/SGAtomic.cxx
@@ -30,8 +30,10 @@
 # include <windows.h>
 #elif defined(GCC_ATOMIC_BUILTINS_FOUND)
 #elif defined(__GNUC__) && defined(__i386__)
-#else
+#elif defined(SGATOMIC_USE_MUTEX)
 # include <simgear/threads/SGGuard.hxx>
+#else
+# error
 #endif
 
 unsigned

diff --git a/simgear/structure/SGAtomic.hxx b/simgear/structure/SGAtomic.hxx
index 91bb262e280c88751bc1c1b07553278af9d0e98c..493c8d25e9b11f0f760a5bcd30eb10c6120ef906 100644 (file)
--- a/simgear/structure/SGAtomic.hxx
+++ b/simgear/structure/SGAtomic.hxx
@@ -35,6 +35,7 @@
 #else
 // The sledge hammer ...
 # define SGATOMIC_USE_LIBRARY_FUNCTIONS
+# define SGATOMIC_USE_MUTEX
 # include <simgear/threads/SGThread.hxx>
 #endif
 
@@ -109,9 +110,7 @@ private:
   SGAtomic(const SGAtomic&);
   SGAtomic& operator=(const SGAtomic&);
 
-#if !defined(SGATOMIC_USE_GCC4_BUILTINS) \
-  && !defined(SGATOMIC_USE_MIPOSPRO_BUILTINS) \
-  && !defined(SGATOMIC_USE_WIN32_INTERLOCKED)
+#if defined(SGATOMIC_USE_MUTEX)
   mutable SGMutex mMutex;
 #endif
   unsigned mValue;