Fix: urcu-bp, urcu, urcu-qsbr should include wfcqueue

Those are still including wfqueue.h, but need to move to wfcqueue.h,
since this is now needed by call_rcu. It was still working, because call
rcu headers include wfcqueue.h, but they were doing so _after_ #undef
_LGPL_SOURCE was issued, which made wfcqueue.h depend on
liburcu-common.so to find the wfcqueue symbols. This was in turn adding
a transitive dependency that was not present before, and thus causing
build failure in cross-build environments, especially those on Debian
systems, due to special handling of transitive dependencies on Debian
autotools.

Reported-by: Simon Marchi <simon.marchi@polymtl.ca>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/urcu-bp.c b/urcu-bp.c
index b9c89d899ea0d744246aa369d8417d8b5a1c4cec..860421a9713e49050f167f1f9af2ce28085fe88d 100644 (file)
--- a/urcu-bp.c
+++ b/urcu-bp.c
@@ -36,7 +36,7 @@
 #include <unistd.h>
 #include <sys/mman.h>
 
-#include "urcu/wfqueue.h"
+#include "urcu/wfcqueue.h"
 #include "urcu/map/urcu-bp.h"
 #include "urcu/static/urcu-bp.h"
 #include "urcu-pointer.h"

diff --git a/urcu-qsbr.c b/urcu-qsbr.c
index d3a6849ac04901097783fd0810b7a4aba4bf792c..19e68d24de96b263cc5108013e95183c4d0dc1df 100644 (file)
--- a/urcu-qsbr.c
+++ b/urcu-qsbr.c
@@ -35,7 +35,7 @@
 #include <errno.h>
 #include <poll.h>
 
-#include "urcu/wfqueue.h"
+#include "urcu/wfcqueue.h"
 #include "urcu/map/urcu-qsbr.h"
 #define BUILD_QSBR_LIB
 #include "urcu/static/urcu-qsbr.h"

diff --git a/urcu.c b/urcu.c
index a5178c0054bea5f0363b571d542b98b4d6803f9e..10ea7de09efe54ff96800aae4019d7198a9efa24 100644 (file)
--- a/urcu.c
+++ b/urcu.c
@@ -36,7 +36,7 @@
 #include <errno.h>
 #include <poll.h>
 
-#include "urcu/wfqueue.h"
+#include "urcu/wfcqueue.h"
 #include "urcu/map/urcu.h"
 #include "urcu/static/urcu.h"
 #include "urcu-pointer.h"