X-Git-Url: http://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=urcu.c;h=2339bc63c872c6a4826d7a52e8d064d85130c0df;hp=e529ac0d5168447cb690162217b7118990996cc1;hb=3eca1b8cce5630bcbd865a8d30855c996bc021c3;hpb=6cf3827cf5809fbcee555fb08286ad756be42dad

diff --git a/urcu.c b/urcu.c
index e529ac0..2339bc6 100644
--- a/urcu.c
+++ b/urcu.c
@@ -24,16 +24,20 @@
  */
 
 #define _BSD_SOURCE
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <pthread.h>
 #include <signal.h>
 #include <assert.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <string.h>
 #include <errno.h>
 #include <poll.h>
 
-#include "urcu-static.h"
+#include "urcu/map/urcu.h"
+
+#include "urcu/static/urcu.h"
 /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */
 #include "urcu.h"
 
@@ -59,7 +63,7 @@ void __attribute__((destructor)) rcu_exit(void);
 
 static pthread_mutex_t rcu_gp_lock = PTHREAD_MUTEX_INITIALIZER;
 
-int gp_futex;
+int32_t gp_futex;
 
 /*
  * Global grace period counter.
@@ -428,4 +432,8 @@ void rcu_exit(void)
 	assert(act.sa_sigaction == sigrcu_handler);
 	assert(cds_list_empty(&registry));
 }
+
 #endif /* #ifdef RCU_SIGNAL */
+
+#include "urcu-call-rcu-impl.h"
+#include "urcu-defer-impl.h"