X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Farch_x86.h;h=b3f29625142490530b3a813186bb094b069abdb5;hp=a72ef064d236c21d45086fd86293edd251943591;hb=36bc70a84250927ba68d5096a0a9740aec157f9b;hpb=c96a37267efd57cddf7a30f472f9e56f2ecddddc

diff --git a/urcu/arch_x86.h b/urcu/arch_x86.h
index a72ef06..b3f2962 100644
--- a/urcu/arch_x86.h
+++ b/urcu/arch_x86.h
@@ -25,15 +25,15 @@
 #include <urcu/compiler.h>
 #include <urcu/config.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
 #define CONFIG_HAVE_MEM_COHERENCY
 
 #define CACHE_LINE_SIZE	128
 
-#ifndef BITS_PER_LONG
-#define BITS_PER_LONG	(__SIZEOF_LONG__ * 8)
-#endif
-
-#ifdef CONFIG_HAVE_FENCE
+#ifdef CONFIG_URCU_HAVE_FENCE
 #define mb()    asm volatile("mfence":::"memory")
 #define rmb()   asm volatile("lfence":::"memory")
 #define wmb()   asm volatile("sfence"::: "memory")
@@ -62,7 +62,7 @@
 #define rmc()	barrier()
 #define wmc()	barrier()
 
-#ifdef CONFIG_SMP
+#ifdef CONFIG_URCU_SMP
 #define smp_mb()	mb()
 #define smp_rmb()	rmb()
 #define smp_wmb()	wmb()
@@ -129,4 +129,8 @@ static inline cycles_t get_cycles(void)
         return ret;
 }
 
+#ifdef __cplusplus 
+}
+#endif
+
 #endif /* _URCU_ARCH_X86_H */