avoid multiple evaluation of STORE_SHARED argument

[urcu.git] / urcu / compiler.h

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 6f6d3e97eb3693ebdd7f8cc509b2acde5c709594..aab2c5cdd7bff1c590896f0add675ba3435fcc3a 100644 (file)
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -18,10 +18,12 @@
  * modified is included with the above copyright notice.
  */
 
+#include <stddef.h>    /* for offsetof */
+
 #define likely(x)      __builtin_expect(!!(x), 1)
 #define unlikely(x)    __builtin_expect(!!(x), 0)
 
-#define        barrier()       asm volatile("" : : : "memory");
+#define        barrier()       asm volatile("" : : : "memory")
 
 /*
  * Instruct the compiler to perform only a single access to a variable
@@ -37,14 +39,12 @@
  */
 #define ACCESS_ONCE(x) (*(volatile typeof(x) *)&x)
 
-#if (__GNUC__ == 4)
-#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
+#ifndef max
+#define max(a,b) ((a)>(b)?(a):(b))
 #endif
 
-#ifdef __compiler_offsetof
-#define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER)
-#else
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#ifndef min
+#define min(a,b) ((a)<(b)?(a):(b))
 #endif
 
 #endif /* _URCU_COMPILER_H */