X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Farch_x86.h;h=4abac2bb304de37a42855924de0c7bedbb8bab78;hb=5db941e8f87f9728883c2dd0446698d13d5b9fec;hp=f137a16d841c48e3c663a645286137ffe2114a04;hpb=618c4ae180e1d9406bcad808cd0cb88addc992a1;p=urcu.git

diff --git a/urcu/arch_x86.h b/urcu/arch_x86.h
index f137a16..4abac2b 100644
--- a/urcu/arch_x86.h
+++ b/urcu/arch_x86.h
@@ -25,11 +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
 
-#ifdef CONFIG_URCU_HAVE_FENCE
+#ifdef CONFIG_RCU_HAVE_FENCE
 #define mb()    asm volatile("mfence":::"memory")
 #define rmb()   asm volatile("lfence":::"memory")
 #define wmb()   asm volatile("sfence"::: "memory")
@@ -58,7 +62,7 @@
 #define rmc()	barrier()
 #define wmc()	barrier()
 
-#ifdef CONFIG_URCU_SMP
+#ifdef CONFIG_RCU_SMP
 #define smp_mb()	mb()
 #define smp_rmb()	rmb()
 #define smp_wmb()	wmb()
@@ -125,4 +129,8 @@ static inline cycles_t get_cycles(void)
         return ret;
 }
 
+#ifdef __cplusplus 
+}
+#endif
+
 #endif /* _URCU_ARCH_X86_H */