From af7c2dbeac32c663b64ad05e4eca70e18784463b Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Fri, 10 Jun 2011 15:32:31 -0400 Subject: [PATCH] Headers: move *-static.h headers to urcu/static/ Signed-off-by: Mathieu Desnoyers --- Makefile.am | 4 +--- rculfqueue.c | 2 +- rculfstack.c | 2 +- urcu-bp.c | 2 +- urcu-bp.h | 7 ++++--- urcu-pointer.c | 2 +- urcu-pointer.h | 2 +- urcu-qsbr.c | 2 +- urcu-qsbr.h | 5 +++-- urcu.c | 2 +- urcu.h | 7 ++++--- urcu/rculfqueue.h | 2 +- urcu/rculfstack.h | 2 +- urcu/{rculfqueue-static.h => static/rculfqueue.h} | 0 urcu/{rculfstack-static.h => static/rculfstack.h} | 0 urcu-bp-static.h => urcu/static/urcu-bp.h | 0 urcu-pointer-static.h => urcu/static/urcu-pointer.h | 0 urcu-qsbr-static.h => urcu/static/urcu-qsbr.h | 0 urcu-static.h => urcu/static/urcu.h | 0 urcu/{wfqueue-static.h => static/wfqueue.h} | 0 urcu/{wfstack-static.h => static/wfstack.h} | 0 urcu/wfqueue.h | 2 +- urcu/wfstack.h | 2 +- wfqueue.c | 2 +- wfstack.c | 2 +- 25 files changed, 25 insertions(+), 24 deletions(-) rename urcu/{rculfqueue-static.h => static/rculfqueue.h} (100%) rename urcu/{rculfstack-static.h => static/rculfstack.h} (100%) rename urcu-bp-static.h => urcu/static/urcu-bp.h (100%) rename urcu-pointer-static.h => urcu/static/urcu-pointer.h (100%) rename urcu-qsbr-static.h => urcu/static/urcu-qsbr.h (100%) rename urcu-static.h => urcu/static/urcu.h (100%) rename urcu/{wfqueue-static.h => static/wfqueue.h} (100%) rename urcu/{wfstack-static.h => static/wfstack.h} (100%) diff --git a/Makefile.am b/Makefile.am index 9fb1568..5723b21 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,9 +10,7 @@ nobase_dist_include_HEADERS = urcu/compiler.h urcu/hlist.h urcu/list.h \ urcu/rculist.h urcu/rcuhlist.h urcu/system.h urcu/urcu-futex.h \ urcu/uatomic_generic.h urcu/arch_generic.h urcu/wfstack.h \ urcu/wfqueue.h urcu/rculfstack.h urcu/rculfqueue.h \ - urcu/wfqueue-static.h urcu/wfstack-static.h \ - urcu/rculfqueue-static.h urcu/rculfstack-static.h \ - urcu/urcu_ref.h urcu/map/*.h + urcu/urcu_ref.h urcu/map/*.h urcu/static/*.h nobase_nodist_include_HEADERS = urcu/arch.h urcu/uatomic_arch.h urcu/config.h EXTRA_DIST = $(top_srcdir)/urcu/arch_*.h $(top_srcdir)/urcu/uatomic_arch_*.h \ diff --git a/rculfqueue.c b/rculfqueue.c index c844525..0daee5d 100644 --- a/rculfqueue.c +++ b/rculfqueue.c @@ -27,7 +27,7 @@ #undef _LGPL_SOURCE /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ #include "urcu/rculfqueue.h" -#include "urcu/rculfqueue-static.h" +#include "urcu/static/rculfqueue.h" /* * library wrappers to be used by non-LGPL compatible source code. diff --git a/rculfstack.c b/rculfstack.c index ca50232..4a3041d 100644 --- a/rculfstack.c +++ b/rculfstack.c @@ -27,7 +27,7 @@ #undef _LGPL_SOURCE /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ #include "urcu/rculfstack.h" -#include "urcu/rculfstack-static.h" +#include "urcu/static/rculfstack.h" /* * library wrappers to be used by non-LGPL compatible source code. diff --git a/urcu-bp.c b/urcu-bp.c index 915debe..203642c 100644 --- a/urcu-bp.c +++ b/urcu-bp.c @@ -37,7 +37,7 @@ #include "urcu/map/urcu-bp.h" -#include "urcu-bp-static.h" +#include "urcu/static/urcu-bp.h" /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ #include "urcu-bp.h" diff --git a/urcu-bp.h b/urcu-bp.h index b2b382f..763eb05 100644 --- a/urcu-bp.h +++ b/urcu-bp.h @@ -38,7 +38,8 @@ #include /* - * See urcu-pointer.h and urcu-pointer-static.h for pointer publication headers. + * See urcu-pointer.h and urcu/static/urcu-pointer.h for pointer + * publication headers. */ #include @@ -58,7 +59,7 @@ extern "C" { #ifdef _LGPL_SOURCE -#include +#include /* * Mappings for static use of the userspace RCU library. @@ -78,7 +79,7 @@ extern "C" { /* * library wrappers to be used by non-LGPL compatible source code. - * See LGPL-only urcu-pointer-static.h for documentation. + * See LGPL-only urcu/static/urcu-pointer.h for documentation. */ extern void rcu_read_lock(void); diff --git a/urcu-pointer.c b/urcu-pointer.c index 180c834..7dfb53a 100644 --- a/urcu-pointer.c +++ b/urcu-pointer.c @@ -26,7 +26,7 @@ #include -#include "urcu-pointer-static.h" +#include "urcu/static/urcu-pointer.h" /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ #include "urcu-pointer.h" diff --git a/urcu-pointer.h b/urcu-pointer.h index 7b240a7..359a99f 100644 --- a/urcu-pointer.h +++ b/urcu-pointer.h @@ -36,7 +36,7 @@ extern "C" { #ifdef _LGPL_SOURCE -#include +#include /* * rcu_dereference(ptr) diff --git a/urcu-qsbr.c b/urcu-qsbr.c index bb10bb8..5eda71d 100644 --- a/urcu-qsbr.c +++ b/urcu-qsbr.c @@ -36,7 +36,7 @@ #include "urcu/map/urcu-qsbr.h" #define BUILD_QSBR_LIB -#include "urcu-qsbr-static.h" +#include "urcu/static/urcu-qsbr.h" /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ #include "urcu-qsbr.h" diff --git a/urcu-qsbr.h b/urcu-qsbr.h index 1d5c568..20dbf47 100644 --- a/urcu-qsbr.h +++ b/urcu-qsbr.h @@ -32,7 +32,8 @@ #include /* - * See urcu-pointer.h and urcu-pointer-static.h for pointer publication headers. + * See urcu-pointer.h and urcu/static/urcu-pointer.h for pointer + * publication headers. */ #include @@ -52,7 +53,7 @@ extern "C" { #ifdef _LGPL_SOURCE -#include +#include /* * Mappings for static use of the userspace RCU library. diff --git a/urcu.c b/urcu.c index 98c5fbc..ccaf3e9 100644 --- a/urcu.c +++ b/urcu.c @@ -36,7 +36,7 @@ #include "urcu/map/urcu.h" -#include "urcu-static.h" +#include "urcu/static/urcu.h" /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ #include "urcu.h" diff --git a/urcu.h b/urcu.h index 0fa2fea..d4c8753 100644 --- a/urcu.h +++ b/urcu.h @@ -35,7 +35,8 @@ #include /* - * See urcu-pointer.h and urcu-pointer-static.h for pointer publication headers. + * See urcu-pointer.h and urcu/static/urcu-pointer.h for pointer + * publication headers. */ #include @@ -55,7 +56,7 @@ extern "C" { #ifdef _LGPL_SOURCE -#include +#include /* * Mappings for static use of the userspace RCU library. @@ -85,7 +86,7 @@ extern "C" { /* * library wrappers to be used by non-LGPL compatible source code. - * See LGPL-only urcu-pointer-static.h for documentation. + * See LGPL-only urcu/static/urcu-pointer.h for documentation. */ extern void rcu_read_lock(void); diff --git a/urcu/rculfqueue.h b/urcu/rculfqueue.h index fa54ca5..c3084b7 100644 --- a/urcu/rculfqueue.h +++ b/urcu/rculfqueue.h @@ -57,7 +57,7 @@ struct cds_lfq_queue_rcu { #ifdef _LGPL_SOURCE -#include +#include #define cds_lfq_node_init_rcu _cds_lfq_node_init_rcu #define cds_lfq_init_rcu _cds_lfq_init_rcu diff --git a/urcu/rculfstack.h b/urcu/rculfstack.h index d759854..6a240fd 100644 --- a/urcu/rculfstack.h +++ b/urcu/rculfstack.h @@ -37,7 +37,7 @@ struct cds_lfs_stack_rcu { #ifdef _LGPL_SOURCE -#include +#include #define cds_lfs_node_init_rcu _cds_lfs_node_init_rcu #define cds_lfs_init_rcu _cds_lfs_init_rcu diff --git a/urcu/rculfqueue-static.h b/urcu/static/rculfqueue.h similarity index 100% rename from urcu/rculfqueue-static.h rename to urcu/static/rculfqueue.h diff --git a/urcu/rculfstack-static.h b/urcu/static/rculfstack.h similarity index 100% rename from urcu/rculfstack-static.h rename to urcu/static/rculfstack.h diff --git a/urcu-bp-static.h b/urcu/static/urcu-bp.h similarity index 100% rename from urcu-bp-static.h rename to urcu/static/urcu-bp.h diff --git a/urcu-pointer-static.h b/urcu/static/urcu-pointer.h similarity index 100% rename from urcu-pointer-static.h rename to urcu/static/urcu-pointer.h diff --git a/urcu-qsbr-static.h b/urcu/static/urcu-qsbr.h similarity index 100% rename from urcu-qsbr-static.h rename to urcu/static/urcu-qsbr.h diff --git a/urcu-static.h b/urcu/static/urcu.h similarity index 100% rename from urcu-static.h rename to urcu/static/urcu.h diff --git a/urcu/wfqueue-static.h b/urcu/static/wfqueue.h similarity index 100% rename from urcu/wfqueue-static.h rename to urcu/static/wfqueue.h diff --git a/urcu/wfstack-static.h b/urcu/static/wfstack.h similarity index 100% rename from urcu/wfstack-static.h rename to urcu/static/wfstack.h diff --git a/urcu/wfqueue.h b/urcu/wfqueue.h index f063900..03a73f1 100644 --- a/urcu/wfqueue.h +++ b/urcu/wfqueue.h @@ -52,7 +52,7 @@ struct cds_wfq_queue { #ifdef _LGPL_SOURCE -#include +#include #define cds_wfq_node_init _cds_wfq_node_init #define cds_wfq_init _cds_wfq_init diff --git a/urcu/wfstack.h b/urcu/wfstack.h index c13ba64..354646d 100644 --- a/urcu/wfstack.h +++ b/urcu/wfstack.h @@ -42,7 +42,7 @@ struct cds_wfs_stack { #ifdef _LGPL_SOURCE -#include +#include #define cds_wfs_node_init _cds_wfs_node_init #define cds_wfs_init _cds_wfs_init diff --git a/wfqueue.c b/wfqueue.c index dc7bdfc..3337171 100644 --- a/wfqueue.c +++ b/wfqueue.c @@ -22,7 +22,7 @@ /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ #include "urcu/wfqueue.h" -#include "urcu/wfqueue-static.h" +#include "urcu/static/wfqueue.h" /* * library wrappers to be used by non-LGPL compatible source code. diff --git a/wfstack.c b/wfstack.c index db29558..d999a5b 100644 --- a/wfstack.c +++ b/wfstack.c @@ -22,7 +22,7 @@ /* Do not #define _LGPL_SOURCE to ensure we can emit the wrapper symbols */ #include "urcu/wfstack.h" -#include "urcu/wfstack-static.h" +#include "urcu/static/wfstack.h" /* * library wrappers to be used by non-LGPL compatible source code. -- 2.34.1