X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu%2Farch_x86.h;h=b3f29625142490530b3a813186bb094b069abdb5;hp=806878e26791132b1813c1ca25197efee59b06ce;hb=36bc70a84250927ba68d5096a0a9740aec157f9b;hpb=7d413817f09b2d17b1a79ea012590609ffab5eb6

diff --git a/urcu/arch_x86.h b/urcu/arch_x86.h
index 806878e..b3f2962 100644
--- a/urcu/arch_x86.h
+++ b/urcu/arch_x86.h
@@ -23,19 +23,17 @@
  */
 
 #include <urcu/compiler.h>
-#include "config.h"
+#include <urcu/config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif 
 
-/* Assume P4 or newer */
-#define CONFIG_HAVE_FENCE 1
 #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")
@@ -64,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()
@@ -131,4 +129,8 @@ static inline cycles_t get_cycles(void)
         return ret;
 }
 
+#ifdef __cplusplus 
+}
+#endif
+
 #endif /* _URCU_ARCH_X86_H */