From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 8 Aug 2011 15:15:03 +0000 (-0400)
Subject: Merge branch 'master' into lfqueue-dev
X-Git-Tag: v0.6.5~59
X-Git-Url: http://git.lttng.org/?a=commitdiff_plain;h=bc727dc3413af8a5a53167df248a51c6ee2f5cb7;hp=e0c7c3eb892ecbba34e1ff8035bcdd55b502b37a;p=urcu.git

Merge branch 'master' into lfqueue-dev
---

diff --git a/ChangeLog b/ChangeLog
index 6782b61..e355ee8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-21 Userspace RCU 0.6.4
+	* uatomic: Fix ARM build errors in uatomic.
+	* urcu tests: hold mutex across use of custom allocator.
+	* Portability fixes to support FreeBSD 8.2.
+
 2011-06-27 Userspace RCU 0.6.3
 	* uatomic: Fix i386 compatibility build errors in uatomic.
 
diff --git a/configure.ac b/configure.ac
index e4105c3..2c8b219 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 
-AC_INIT([userspace-rcu], [0.6.3], [mathieu dot desnoyers at efficios dot com])
+AC_INIT([userspace-rcu], [0.6.4], [mathieu dot desnoyers at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
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(&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 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__)