From d73fb81f74a79aa1e4987d16179f8489b955c812 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Thu, 11 Oct 2012 12:44:10 -0400 Subject: [PATCH] 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 Signed-off-by: Mathieu Desnoyers --- urcu-bp.c | 2 +- urcu-qsbr.c | 2 +- urcu.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/urcu-bp.c b/urcu-bp.c index b9c89d8..860421a 100644 --- a/urcu-bp.c +++ b/urcu-bp.c @@ -36,7 +36,7 @@ #include #include -#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 d3a6849..19e68d2 100644 --- a/urcu-qsbr.c +++ b/urcu-qsbr.c @@ -35,7 +35,7 @@ #include #include -#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 a5178c0..10ea7de 100644 --- a/urcu.c +++ b/urcu.c @@ -36,7 +36,7 @@ #include #include -#include "urcu/wfqueue.h" +#include "urcu/wfcqueue.h" #include "urcu/map/urcu.h" #include "urcu/static/urcu.h" #include "urcu-pointer.h" -- 2.34.1