From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Fri, 30 Nov 2018 21:22:08 +0000 (-0500)
Subject: rculfhash: do not include urcu-call-rcu.h from public API
X-Git-Tag: v0.11.0~28
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=6bcce2356ba83372b1ca481ace59f5d489e269f2;p=userspace-rcu.git

rculfhash: do not include urcu-call-rcu.h from public API

This include is not needed, and because of it rculfhash needs to be
included after the RCU flavor is chosen.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/include/urcu/flavor.h b/include/urcu/flavor.h
index 411fefb..d2d19f6 100644
--- a/include/urcu/flavor.h
+++ b/include/urcu/flavor.h
@@ -27,6 +27,8 @@
 extern "C" {
 #endif
 
+struct rcu_head;
+
 struct urcu_atfork {
 	void (*before_fork)(void *priv);
 	void (*after_fork_parent)(void *priv);
diff --git a/include/urcu/rculfhash.h b/include/urcu/rculfhash.h
index 0789aa5..6960879 100644
--- a/include/urcu/rculfhash.h
+++ b/include/urcu/rculfhash.h
@@ -27,8 +27,8 @@
  */
 
 #include <stdint.h>
+#include <pthread.h>
 #include <urcu/compiler.h>
-#include <urcu-call-rcu.h>
 #include <urcu-flavor.h>
 
 #ifdef __cplusplus
diff --git a/src/rculfhash-internal.h b/src/rculfhash-internal.h
index 0f8df97..d29a923 100644
--- a/src/rculfhash-internal.h
+++ b/src/rculfhash-internal.h
@@ -26,6 +26,8 @@
 
 #include <urcu/rculfhash.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
 
 #ifdef DEBUG
 #define dbg_printf(fmt, args...)     printf("[debug rculfhash] " fmt, ## args)