From 3fc3fc060f1a1b19fc9704e7705227dde7fce409 Mon Sep 17 00:00:00 2001
From: Paul MARTZ <pmartz@skew-matrix.com>
Date: Mon, 22 Mar 2010 22:24:42 +0000
Subject: [PATCH] 2.8 branch: OpenThreads fix for OSX. Merged 10927 from trunk.

---
 include/OpenThreads/Atomic | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/OpenThreads/Atomic b/include/OpenThreads/Atomic
index bdc4fea2b..02ff8d7e9 100644
--- a/include/OpenThreads/Atomic
+++ b/include/OpenThreads/Atomic
@@ -17,17 +17,17 @@
 #include <OpenThreads/Config>
 #include <OpenThreads/Exports>
 
-#if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS) && defined(__i386__)
-#define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES
+#if defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
+# include <libkern/OSAtomic.h>
+# define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES
+#elif defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS) && defined(__i386__)
+# define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES
 #elif defined(_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED)
-#define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES
+# define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES
 #elif defined(_OPENTHREADS_ATOMIC_USE_SUN)
 # include <atomic.h>
 # include "Mutex"
 # include "ScopedLock"
-#elif defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC)
-# include <libkern/OSAtomic.h>
-# define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES
 #elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX)
 # include "Mutex"
 # include "ScopedLock"