X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Farch_s390.h;h=22a1853fb831903ede0575c40e14b87b46b6326b;hb=ee39cfb61d2a389db3342751762412f332a3e851;hp=148545b2df5d44c435a96bfde6718018e4069888;hpb=5b3c6672bc2d47241979495dca0ad0645db9ff26;p=urcu.git

diff --git a/urcu/arch_s390.h b/urcu/arch_s390.h
index 148545b..22a1853 100644
--- a/urcu/arch_s390.h
+++ b/urcu/arch_s390.h
@@ -1,5 +1,5 @@
-#ifndef _ARCH_S390_H
-#define _ARCH_S390_H
+#ifndef _URCU_ARCH_S390_H
+#define _URCU_ARCH_S390_H
 
 /*
  * Trivial definitions for the S390 architecture based on information from the
@@ -28,9 +28,13 @@
  * IN THE SOFTWARE.
  */
 
-#include <compiler.h>
+#include <urcu/compiler.h>
 #include <urcu/config.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
 #define CONFIG_HAVE_MEM_COHERENCY
 
 #define CACHE_LINE_SIZE	128
@@ -48,13 +52,13 @@
 #endif
 
 #define mb()    __asm__ __volatile__("bcr 15,0" : : : "memory")
-#define rmb()   __asm__ __volatile__("bcr 15,0" : : : "memory");
-#define wmb()   __asm__ __volatile__("bcr 15,0" : : : "memory");
+#define rmb()   __asm__ __volatile__("bcr 15,0" : : : "memory")
+#define wmb()   __asm__ __volatile__("bcr 15,0" : : : "memory")
 #define mc()	barrier()
 #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()
@@ -94,4 +98,8 @@ static inline cycles_t get_cycles (void)
 	return cycles;
 }
 
-#endif /* _ARCH_S390_H */
+#ifdef __cplusplus 
+}
+#endif
+
+#endif /* _URCU_ARCH_S390_H */