Use caa_ prefix for min() and max()

[urcu.git] / urcu / compiler.h

diff --git a/urcu/compiler.h b/urcu/compiler.h
index 64d12d344a26a1fdca56fd0b1201437241b9967a..54904cc4078ed144f8a25bc4778cea1ef7fd1319 100644 (file)
--- 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__)