projects
/
urcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
centralize definition of BITS_PER_LONG
[urcu.git]
/
urcu
/
compiler.h
diff --git
a/urcu/compiler.h
b/urcu/compiler.h
index 6f6d3e97eb3693ebdd7f8cc509b2acde5c709594..5b7bb305b2de83b1828171f506d7241d3c692d03 100644
(file)
--- a/
urcu/compiler.h
+++ b/
urcu/compiler.h
@@
-18,10
+18,12
@@
* modified is included with the above copyright notice.
*/
* 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 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
/*
* Instruct the compiler to perform only a single access to a variable
@@
-37,14
+39,20
@@
*/
#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&x)
*/
#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
+
+#ifndef min
+#define min(a,b) ((a)<(b)?(a):(b))
#endif
#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
#else
-#define
offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
+#define
BITS_PER_LONG 32
#endif
#endif /* _URCU_COMPILER_H */
#endif
#endif /* _URCU_COMPILER_H */
This page took
0.023507 seconds
and
4
git commands to generate.