X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Fcompiler.h;fp=urcu%2Fcompiler.h;h=54904cc4078ed144f8a25bc4778cea1ef7fd1319;hp=64d12d344a26a1fdca56fd0b1201437241b9967a;hb=2f8a5ae7266ad4fb9ba77cfa1b4a7104d0465096;hpb=5d80fb65c6d4503d35b52402c5fd81e30376a4c9

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 64d12d3..54904cc 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__)