X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=include%2Furcu%2Fstatic%2Furcu.h;h=0b5ce92b7473daab1ae56a84f0ccbb60da5460c3;hb=22e3a77f65d53b84dbe653fa6cb83181cafe2482;hp=9082af71a92c443dd0efe8be74d879c55dd56ddd;hpb=6893800a4d1cc14dff0395ddcd660a5138db183d;p=urcu.git

diff --git a/include/urcu/static/urcu.h b/include/urcu/static/urcu.h
index 9082af7..0b5ce92 100644
--- a/include/urcu/static/urcu.h
+++ b/include/urcu/static/urcu.h
@@ -34,6 +34,7 @@
 #include <unistd.h>
 #include <stdint.h>
 
+#include <urcu/config.h>
 #include <urcu/compiler.h>
 #include <urcu/arch.h>
 #include <urcu/system.h>
@@ -41,8 +42,8 @@
 #include <urcu/list.h>
 #include <urcu/futex.h>
 #include <urcu/tls-compat.h>
-#include <urcu/rand-compat.h>
 #include <urcu/debug.h>
+#include <urcu/static/urcu-signal.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -61,19 +62,6 @@ extern "C" {
  * This is required to permit relinking with newer versions of the library.
  */
 
-/*
- * The signal number used by the RCU library can be overridden with
- * -DSIGRCU= when compiling the library.
- * Provide backward compatibility for liburcu 0.3.x SIGURCU.
- */
-#ifdef SIGURCU
-#define SIGRCU SIGURCU
-#endif
-
-#ifndef SIGRCU
-#define SIGRCU SIGUSR1
-#endif
-
 enum rcu_state {
 	RCU_READER_ACTIVE_CURRENT,
 	RCU_READER_ACTIVE_OLD,
@@ -90,11 +78,15 @@ enum rcu_state {
  */
 
 #ifdef RCU_MEMBARRIER
-extern int rcu_has_sys_membarrier;
+#ifdef CONFIG_RCU_FORCE_SYS_MEMBARRIER
+#define rcu_has_sys_membarrier_memb	1
+#else
+extern int rcu_has_sys_membarrier_memb;
+#endif
 
 static inline void smp_mb_slave(void)
 {
-	if (caa_likely(rcu_has_sys_membarrier))
+	if (caa_likely(rcu_has_sys_membarrier_memb))
 		cmm_barrier();
 	else
 		cmm_smp_mb();