* 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
* use is to mediate communication between process-level code and irq/NMI
* handlers, all running on the same CPU.
*/
-#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&x)
+#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))
+
+#ifndef max
+#define max(a,b) ((a)>(b)?(a):(b))
+#endif
-#if (__GNUC__ == 4)
-#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
+#ifndef min
+#define min(a,b) ((a)<(b)?(a):(b))
#endif
-#ifdef __compiler_offsetof
-#define offsetof(TYPE, MEMBER) __compiler_offsetof(TYPE, MEMBER)
+#if defined(__SIZEOF_LONG__)
+#define BITS_PER_LONG (__SIZEOF_LONG__ * 8)
+#elif defined(_LP64)
+#define BITS_PER_LONG 64
#else
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#define BITS_PER_LONG 32
#endif
#endif /* _URCU_COMPILER_H */