X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Fcompiler.h;h=f8fce5a6b46558fa4a4b2d50f78f91eecf229c90;hb=a00718e7e5df2c582de11fbd6be3d9420ad6c0e3;hp=64d12d344a26a1fdca56fd0b1201437241b9967a;hpb=6cf3827cf5809fbcee555fb08286ad756be42dad;p=urcu.git

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 64d12d3..f8fce5a 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -39,12 +39,12 @@
  */
 #define CMM_ACCESS_ONCE(x)	(*(volatile typeof(x) *)&(x))
 
-#ifndef max
-#define max(a,b) ((a)>(b)?(a):(b))
+#ifndef caa_max
+#define caa_max(a,b) ((a)>(b)?(a):(b))
 #endif
 
-#ifndef min
-#define min(a,b) ((a)<(b)?(a):(b))
+#ifndef caa_min
+#define caa_min(a,b) ((a)<(b)?(a):(b))
 #endif
 
 #if defined(__SIZEOF_LONG__)
@@ -55,10 +55,20 @@
 #define CAA_BITS_PER_LONG	32
 #endif
 
-#define caa_container_of(ptr, type, member)					\
+/*
+ * caa_container_of - Get the address of an object containing a field.
+ *
+ * @ptr: pointer to the field.
+ * @type: type of the object.
+ * @member: name of the field within the object.
+ */
+#define caa_container_of(ptr, type, member)				\
 	({								\
-		const typeof(((type *)NULL)->member) * __ptr = (ptr);	\
+		const typeof(((type *) NULL)->member) * __ptr = (ptr);	\
 		(type *)((char *)__ptr - offsetof(type, member));	\
 	})
 
+#define CAA_BUILD_BUG_ON_ZERO(cond) (sizeof(struct { int:-!!(cond); }))
+#define CAA_BUILD_BUG_ON(cond) ((void)BUILD_BUG_ON_ZERO(cond))
+
 #endif /* _URCU_COMPILER_H */