Message ID | 20201117202224.83751-1-mjeanson@efficios.com |
---|---|
State | New |
Headers | show |
Series | [urcu] fix: explicitly include urcu/config.h in files using CONFIG_RCU_ defines | expand |
Merged into master, stable-0.11, stable-0.12, thanks! Mathieu ----- On Nov 17, 2020, at 3:22 PM, Michael Jeanson mjeanson at efficios.com wrote: > Signed-off-by: Michael Jeanson <mjeanson at efficios.com> > --- > include/urcu/debug.h | 2 ++ > include/urcu/uatomic/x86.h | 1 + > include/urcu/urcu-qsbr.h | 2 ++ > src/urcu-bp.c | 1 + > src/urcu-utils.h | 2 ++ > src/urcu.c | 1 + > 6 files changed, 9 insertions(+) > > diff --git a/include/urcu/debug.h b/include/urcu/debug.h > index 14b50b6..4a7eac9 100644 > --- a/include/urcu/debug.h > +++ b/include/urcu/debug.h > @@ -21,6 +21,8 @@ > > #include <assert.h> > > +#include <urcu/config.h> > + > #if defined(DEBUG_RCU) || defined(CONFIG_RCU_DEBUG) > #define urcu_assert(...) assert(__VA_ARGS__) > #else > diff --git a/include/urcu/uatomic/x86.h b/include/urcu/uatomic/x86.h > index 129a2f5..2a4ea1c 100644 > --- a/include/urcu/uatomic/x86.h > +++ b/include/urcu/uatomic/x86.h > @@ -20,6 +20,7 @@ > * Boehm-Demers-Weiser conservative garbage collector. > */ > > +#include <urcu/config.h> > #include <urcu/compiler.h> > #include <urcu/system.h> > > diff --git a/include/urcu/urcu-qsbr.h b/include/urcu/urcu-qsbr.h > index 28e6065..fd6cbda 100644 > --- a/include/urcu/urcu-qsbr.h > +++ b/include/urcu/urcu-qsbr.h > @@ -31,6 +31,8 @@ > #include <stdlib.h> > #include <pthread.h> > > +#include <urcu/config.h> > + > /* > * See urcu/pointer.h and urcu/static/pointer.h for pointer > * publication headers. > diff --git a/src/urcu-bp.c b/src/urcu-bp.c > index 05efd97..c2ac792 100644 > --- a/src/urcu-bp.c > +++ b/src/urcu-bp.c > @@ -37,6 +37,7 @@ > #include <stdbool.h> > #include <sys/mman.h> > > +#include <urcu/config.h> > #include <urcu/arch.h> > #include <urcu/wfcqueue.h> > #include <urcu/map/urcu-bp.h> > diff --git a/src/urcu-utils.h b/src/urcu-utils.h > index 407f42e..69e37bd 100644 > --- a/src/urcu-utils.h > +++ b/src/urcu-utils.h > @@ -23,6 +23,8 @@ > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA > */ > > +#include <urcu/config.h> > + > #define urcu_stringify(a) _urcu_stringify(a) > #define _urcu_stringify(a) #a > > diff --git a/src/urcu.c b/src/urcu.c > index f6ca5f8..2ebe993 100644 > --- a/src/urcu.c > +++ b/src/urcu.c > @@ -38,6 +38,7 @@ > #include <stdbool.h> > #include <poll.h> > > +#include <urcu/config.h> > #include <urcu/arch.h> > #include <urcu/wfcqueue.h> > #include <urcu/map/urcu.h> > -- > 2.29.2
diff --git a/include/urcu/debug.h b/include/urcu/debug.h index 14b50b6..4a7eac9 100644 --- a/include/urcu/debug.h +++ b/include/urcu/debug.h @@ -21,6 +21,8 @@ #include <assert.h> +#include <urcu/config.h> + #if defined(DEBUG_RCU) || defined(CONFIG_RCU_DEBUG) #define urcu_assert(...) assert(__VA_ARGS__) #else diff --git a/include/urcu/uatomic/x86.h b/include/urcu/uatomic/x86.h index 129a2f5..2a4ea1c 100644 --- a/include/urcu/uatomic/x86.h +++ b/include/urcu/uatomic/x86.h @@ -20,6 +20,7 @@ * Boehm-Demers-Weiser conservative garbage collector. */ +#include <urcu/config.h> #include <urcu/compiler.h> #include <urcu/system.h> diff --git a/include/urcu/urcu-qsbr.h b/include/urcu/urcu-qsbr.h index 28e6065..fd6cbda 100644 --- a/include/urcu/urcu-qsbr.h +++ b/include/urcu/urcu-qsbr.h @@ -31,6 +31,8 @@ #include <stdlib.h> #include <pthread.h> +#include <urcu/config.h> + /* * See urcu/pointer.h and urcu/static/pointer.h for pointer * publication headers. diff --git a/src/urcu-bp.c b/src/urcu-bp.c index 05efd97..c2ac792 100644 --- a/src/urcu-bp.c +++ b/src/urcu-bp.c @@ -37,6 +37,7 @@ #include <stdbool.h> #include <sys/mman.h> +#include <urcu/config.h> #include <urcu/arch.h> #include <urcu/wfcqueue.h> #include <urcu/map/urcu-bp.h> diff --git a/src/urcu-utils.h b/src/urcu-utils.h index 407f42e..69e37bd 100644 --- a/src/urcu-utils.h +++ b/src/urcu-utils.h @@ -23,6 +23,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <urcu/config.h> + #define urcu_stringify(a) _urcu_stringify(a) #define _urcu_stringify(a) #a diff --git a/src/urcu.c b/src/urcu.c index f6ca5f8..2ebe993 100644 --- a/src/urcu.c +++ b/src/urcu.c @@ -38,6 +38,7 @@ #include <stdbool.h> #include <poll.h> +#include <urcu/config.h> #include <urcu/arch.h> #include <urcu/wfcqueue.h> #include <urcu/map/urcu.h>
Signed-off-by: Michael Jeanson <mjeanson at efficios.com> --- include/urcu/debug.h | 2 ++ include/urcu/uatomic/x86.h | 1 + include/urcu/urcu-qsbr.h | 2 ++ src/urcu-bp.c | 1 + src/urcu-utils.h | 2 ++ src/urcu.c | 1 + 6 files changed, 9 insertions(+)