From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 29 Jun 2011 18:20:31 +0000 (-0400)
Subject: non-linux system membarrier fallback update
X-Git-Tag: v0.6.4~9
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=65f1e63457777f07170bde29241f483ebfc2d717;p=urcu.git

non-linux system membarrier fallback update

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/urcu/static/urcu.h b/urcu/static/urcu.h
index f2293bc..0295a3e 100644
--- a/urcu/static/urcu.h
+++ b/urcu/static/urcu.h
@@ -45,13 +45,18 @@
 extern "C" {
 #endif 
 
-/* Default is RCU_MEMBARRIER on linux */
+/* Default is RCU_MEMBARRIER */
 #if !defined(RCU_MEMBARRIER) && !defined(RCU_MB) && !defined(RCU_SIGNAL)
-# ifdef __linux__
-# define RCU_MEMBARRIER
-# else
-# define RCU_MB
-# endif
+#define RCU_MEMBARRIER
+#endif
+
+/*
+ * RCU_MEMBARRIER is only possibly available on Linux. Fallback to RCU_MB
+ * otherwise.
+ */
+#if !defined(__linux__) && defined(RCU_MEMBARRIER)
+#undef RCU_MEMBARRIER
+#define RCU_MB
 #endif
 
 #ifdef RCU_MEMBARRIER