X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=urcu%2Fcompiler.h;h=ce19c74764de7c82c5c8dbb06e2ddd214027c5f8;hb=a2c502feb1f1510eef3234168bc16a98404694bf;hp=4dd89ea212285e664e2cd3c35e796a9af1d73d1e;hpb=49d7d158702c3d9fa3e62e5965dbd1a5b898b9c7;p=urcu.git

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 4dd89ea..ce19c74 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -23,7 +23,7 @@
 #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,6 +37,22 @@
  * 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
+
+#ifndef min
+#define min(a,b) ((a)<(b)?(a):(b))
+#endif
+
+#if defined(__SIZEOF_LONG__)
+#define BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
+#elif defined(_LP64)
+#define BITS_PER_LONG	64
+#else
+#define BITS_PER_LONG	32
+#endif
 
 #endif /* _URCU_COMPILER_H */