X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=urcu%2Fcompiler.h;h=975e1eadc1e9cfddd8c21d34f129921808ef7863;hb=fdee2e6dc73cc504ba24be89da539c68742e508e;hp=6f6d3e97eb3693ebdd7f8cc509b2acde5c709594;hpb=ec4e58a3aba2084440012f8ccac3a31eb6101183;p=urcu.git

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 6f6d3e9..975e1ea 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -18,6 +18,8 @@
  * 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)
 
@@ -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 */