Use caa_ prefix for min() and max()

Defining min/max macros clashes with C++.

Reported-by: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/urcu-bp.c b/urcu-bp.c
index 39a6cd0e9ab3ffe06f1d96eaeb889f77f692ac89..273acb88cf2d1749e57bb840bc6e78ab414ebf1d 100644 (file)
--- a/urcu-bp.c
+++ b/urcu-bp.c
@@ -295,7 +295,7 @@ static void add_thread(void)
        if (registry_arena.len
            < registry_arena.used + sizeof(struct rcu_reader))
                resize_arena(&registry_arena,
-               max(registry_arena.len << 1, ARENA_INIT_ALLOC));
+               caa_max(registry_arena.len << 1, ARENA_INIT_ALLOC));
        /*
         * Find a free spot.
         */

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__)