Changeset 10927

Show
Ignore:
Timestamp:
01/07/10 18:20:55 (4 years ago)
Author:
robert
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/include/OpenThreads/Atomic

    r10789 r10927  
    1818#include <OpenThreads/Exports> 
    1919 
    20 #if defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS) && defined(__i386__) 
    21 #define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES 
     20#if defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC) 
     21# include <libkern/OSAtomic.h> 
     22# define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES 
     23#elif defined(_OPENTHREADS_ATOMIC_USE_GCC_BUILTINS) && defined(__i386__) 
     24# define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES 
    2225#elif defined(_OPENTHREADS_ATOMIC_USE_WIN32_INTERLOCKED) 
    23 #define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES 
     26# define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES 
    2427#elif defined(_OPENTHREADS_ATOMIC_USE_SUN) 
    2528# include <atomic.h> 
    2629# include "Mutex" 
    2730# include "ScopedLock" 
    28 #elif defined(_OPENTHREADS_ATOMIC_USE_BSD_ATOMIC) 
    29 # include <libkern/OSAtomic.h> 
    30 # define _OPENTHREADS_ATOMIC_USE_LIBRARY_ROUTINES 
    3131#elif defined(_OPENTHREADS_ATOMIC_USE_MUTEX) 
    3232# include "Mutex"