From a0479bdb21fad7e0ccfa6da5f6b80c3f34cb763c Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 7 Jan 2010 17:20:55 +0000 Subject: [PATCH] From Chuck Seberino, (submitted by Stephan Huber) Chuck's original message : "I have a patch to submit that fixes the following error when building against OSX 10.6.2." --- include/OpenThreads/Atomic | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/OpenThreads/Atomic b/include/OpenThreads/Atomic index 7a89504cf..8b8ac4de3 100644 --- a/include/OpenThreads/Atomic +++ b/include/OpenThreads/Atomic @@ -17,17 +17,17 @@ #include #include -#if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS) && defined(__i386__) -#define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES +#if defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC) +# include +# 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 # include "Mutex" # include "ScopedLock" -#elif defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC) -# include -# define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES #elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX) # include "Mutex" # include "ScopedLock"