Define OSATOMIC_USE_INLINED to get usable atomics on DARWIN

[openafs.git] / src / rx / rx_atomic.h

diff --git a/src/rx/rx_atomic.h b/src/rx/rx_atomic.h
index 5d3c7f5..5bf35fe 100644 (file)
--- a/src/rx/rx_atomic.h
+++ b/src/rx/rx_atomic.h
@@ -184,14 +184,21 @@ rx_atomic_test_and_clear_bit(rx_atomic_t *atomic, int bit) {
 
 #elif defined(AFS_DARWIN80_ENV) || defined(AFS_USR_DARWIN80_ENV)
 
-#include <libkern/OSAtomic.h>
-#if defined(KERNEL) && !defined(UKERNEL)
-#define OSAtomicIncrement32 OSIncrementAtomic
-#define OSAtomicAdd32 OSAddAtomic
-#define OSAtomicDecrement32 OSDecrementAtomic
-#define OSAtomicOr32 OSBitOrAtomic
-#define OSAtomicAnd32 OSBitAndAtomic
-#endif
+# if defined (AFS_DARWIN160_ENV) || defined(AFS_USR_DARWIN160_ENV)
+#  define OSATOMIC_USE_INLINED 1
+# else
+
+#  if defined(KERNEL) && !defined(UKERNEL)
+#   define OSAtomicIncrement32 OSIncrementAtomic
+#   define OSAtomicAdd32 OSAddAtomic
+#   define OSAtomicDecrement32 OSDecrementAtomic
+#   define OSAtomicOr32 OSBitOrAtomic
+#   define OSAtomicAnd32 OSBitAndAtomic
+#  endif
+
+# endif /* end defined DARWIN160 */
+
+# include <libkern/OSAtomic.h>
 
 typedef struct {
     volatile int var;
@@ -280,7 +287,7 @@ typedef atomic_t rx_atomic_t;
 #define rx_atomic_inc(X)         atomic_inc(X)
 #define rx_atomic_inc_and_read(X) atomic_inc_return(X)
 #define rx_atomic_add(X, V)      atomic_add(V, X)
-#define rx_atomic_add_and_read(X, V) atomic_add_return(V, X);
+#define rx_atomic_add_and_read(X, V) atomic_add_return(V, X)
 #define rx_atomic_dec(X)         atomic_dec(X)
 #define rx_atomic_dec_and_read(X) atomic_dec_return(X)
 #define rx_atomic_sub(X, V)      atomic_sub(V, X)