X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Fcompiler.h;h=54904cc4078ed144f8a25bc4778cea1ef7fd1319;hb=bc727dc3413af8a5a53167df248a51c6ee2f5cb7;hp=ca32debce01d47a49614bd281ab495355949f4aa;hpb=06f22bdbb0c4c4d5db42a2e2dc35818aa61415be;p=urcu.git

diff --git a/urcu/compiler.h b/urcu/compiler.h
index ca32deb..54904cc 100644
--- a/urcu/compiler.h
+++ b/urcu/compiler.h
@@ -28,23 +28,23 @@
 /*
  * Instruct the compiler to perform only a single access to a variable
  * (prohibits merging and refetching). The compiler is also forbidden to reorder
- * successive instances of CAA_ACCESS_ONCE(), but only when the compiler is aware of
+ * successive instances of CMM_ACCESS_ONCE(), but only when the compiler is aware of
  * particular ordering. Compiler ordering can be ensured, for example, by
- * putting two CAA_ACCESS_ONCE() in separate C statements.
+ * putting two CMM_ACCESS_ONCE() in separate C statements.
  *
  * This macro does absolutely -nothing- to prevent the CPU from reordering,
  * merging, or refetching absolutely anything at any time.  Its main intended
  * use is to mediate communication between process-level code and irq/NMI
  * handlers, all running on the same CPU.
  */
-#define CAA_ACCESS_ONCE(x)	(*(volatile typeof(x) *)&(x))
+#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__)