From 2f8a5ae7266ad4fb9ba77cfa1b4a7104d0465096 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 2 Aug 2011 13:22:38 -0400 Subject: [PATCH] Use caa_ prefix for min() and max() Defining min/max macros clashes with C++. Reported-by: Vegard Nossum Signed-off-by: Mathieu Desnoyers --- urcu-bp.c | 2 +- urcu/compiler.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/urcu-bp.c b/urcu-bp.c index 39a6cd0..273acb8 100644 --- 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(®istry_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 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__) -- 2.34.1