X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu-defer-static.h;h=082298a5267fefced9f7259ff3f193f232a5a5c9;hp=593f9a8bb18e4c04422fb5b74c18bedda0d1d84c;hb=f0708810fe66d7fdcf52903c607ed65c9fa664c7;hpb=1ccf9cbe71d7392fb87e4b0046bd2eb94a75b541

diff --git a/urcu-defer-static.h b/urcu-defer-static.h
index 593f9a8..082298a 100644
--- a/urcu-defer-static.h
+++ b/urcu-defer-static.h
@@ -34,9 +34,13 @@
 
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
-#include <urcu/arch_uatomic.h>
+#include <urcu/uatomic_arch.h>
 #include <urcu/list.h>
+#include <urcu/system.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * Number of entries in the per-thread defer queue. Must be power of 2.
@@ -61,36 +65,6 @@
 	(x = (void *)((unsigned long)(x) & ~DQ_FCT_BIT))
 #define DQ_FCT_MARK		((void *)(~DQ_FCT_BIT))
 
-/*
- * Identify a shared load. A smp_rmc() or smp_mc() should come before the load.
- */
-#define _LOAD_SHARED(p)	       ACCESS_ONCE(p)
-
-/*
- * Load a data from shared memory, doing a cache flush if required.
- */
-#define LOAD_SHARED(p)			\
-	({				\
-		smp_rmc();		\
-		_LOAD_SHARED(p);	\
-	})
-
-/*
- * Identify a shared store. A smp_wmc() or smp_mc() should follow the store.
- */
-#define _STORE_SHARED(x, v)	({ ACCESS_ONCE(x) = (v); })
-
-/*
- * Store v into x, where x is located in shared memory. Performs the required
- * cache flush after writing. Returns v.
- */
-#define STORE_SHARED(x, v)		\
-	({				\
-		_STORE_SHARED(x, v);	\
-		smp_wmc();		\
-		(v);			\
-	})
-
 /*
  * This code section can only be included in LGPL 2.1 compatible source code.
  * See below for the function call wrappers which can be used in code meant to
@@ -127,4 +101,8 @@ struct defer_queue {
 	struct list_head list;	/* list of thread queues */
 };
 
+#ifdef __cplusplus 
+}
+#endif
+
 #endif /* _URCU_DEFER_STATIC_H */