From 2ae4650998642ce1aa762c66cdcba6cf6af25314 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Tue, 24 May 2011 09:02:07 -0400 Subject: [PATCH] Always use module-local ring buffer We are doing modifications currently, so don't take chances using an externally packaged ring buffer. Signed-off-by: Mathieu Desnoyers --- wrapper/ringbuffer/api.h | 4 ---- wrapper/ringbuffer/backend.h | 4 ---- wrapper/ringbuffer/backend_internal.h | 4 ---- wrapper/ringbuffer/backend_types.h | 4 ---- wrapper/ringbuffer/config.h | 4 ---- wrapper/ringbuffer/frontend.h | 4 ---- wrapper/ringbuffer/frontend_api.h | 4 ---- wrapper/ringbuffer/frontend_internal.h | 4 ---- wrapper/ringbuffer/frontend_types.h | 4 ---- wrapper/ringbuffer/iterator.h | 4 ---- wrapper/ringbuffer/nohz.h | 4 ---- wrapper/ringbuffer/vatomic.h | 4 ---- wrapper/ringbuffer/vfs.h | 4 ---- 13 files changed, 52 deletions(-) diff --git a/wrapper/ringbuffer/api.h b/wrapper/ringbuffer/api.h index c4b2ed73..182bee28 100644 --- a/wrapper/ringbuffer/api.h +++ b/wrapper/ringbuffer/api.h @@ -1,5 +1 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../lib/ringbuffer/api.h" -#endif diff --git a/wrapper/ringbuffer/backend.h b/wrapper/ringbuffer/backend.h index 8f98bb3b..bfdd39de 100644 --- a/wrapper/ringbuffer/backend.h +++ b/wrapper/ringbuffer/backend.h @@ -1,5 +1 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../lib/ringbuffer/backend.h" -#endif diff --git a/wrapper/ringbuffer/backend_internal.h b/wrapper/ringbuffer/backend_internal.h index 0ed6b728..00d45e42 100644 --- a/wrapper/ringbuffer/backend_internal.h +++ b/wrapper/ringbuffer/backend_internal.h @@ -1,6 +1,2 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../wrapper/inline_memcpy.h" #include "../../lib/ringbuffer/backend_internal.h" -#endif diff --git a/wrapper/ringbuffer/backend_types.h b/wrapper/ringbuffer/backend_types.h index 41c65d2d..c59effda 100644 --- a/wrapper/ringbuffer/backend_types.h +++ b/wrapper/ringbuffer/backend_types.h @@ -1,5 +1 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../lib/ringbuffer/backend_types.h" -#endif diff --git a/wrapper/ringbuffer/config.h b/wrapper/ringbuffer/config.h index 12d9c279..0ce7a9da 100644 --- a/wrapper/ringbuffer/config.h +++ b/wrapper/ringbuffer/config.h @@ -1,5 +1 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../lib/ringbuffer/config.h" -#endif diff --git a/wrapper/ringbuffer/frontend.h b/wrapper/ringbuffer/frontend.h index e454f3eb..7c6c0705 100644 --- a/wrapper/ringbuffer/frontend.h +++ b/wrapper/ringbuffer/frontend.h @@ -1,5 +1 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../lib/ringbuffer/frontend.h" -#endif diff --git a/wrapper/ringbuffer/frontend_api.h b/wrapper/ringbuffer/frontend_api.h index 71b760e1..b03c501c 100644 --- a/wrapper/ringbuffer/frontend_api.h +++ b/wrapper/ringbuffer/frontend_api.h @@ -1,5 +1 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../lib/ringbuffer/frontend_api.h" -#endif diff --git a/wrapper/ringbuffer/frontend_internal.h b/wrapper/ringbuffer/frontend_internal.h index 7cc821d6..18991014 100644 --- a/wrapper/ringbuffer/frontend_internal.h +++ b/wrapper/ringbuffer/frontend_internal.h @@ -1,5 +1 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../lib/ringbuffer/frontend_internal.h" -#endif diff --git a/wrapper/ringbuffer/frontend_types.h b/wrapper/ringbuffer/frontend_types.h index f4cd85b0..0c23244b 100644 --- a/wrapper/ringbuffer/frontend_types.h +++ b/wrapper/ringbuffer/frontend_types.h @@ -1,5 +1 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../lib/ringbuffer/frontend_types.h" -#endif diff --git a/wrapper/ringbuffer/iterator.h b/wrapper/ringbuffer/iterator.h index d365afce..76e9edbb 100644 --- a/wrapper/ringbuffer/iterator.h +++ b/wrapper/ringbuffer/iterator.h @@ -1,5 +1 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../lib/ringbuffer/iterator.h" -#endif diff --git a/wrapper/ringbuffer/nohz.h b/wrapper/ringbuffer/nohz.h index 1c614e0c..9fbb84d2 100644 --- a/wrapper/ringbuffer/nohz.h +++ b/wrapper/ringbuffer/nohz.h @@ -1,5 +1 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../lib/ringbuffer/nohz.h" -#endif diff --git a/wrapper/ringbuffer/vatomic.h b/wrapper/ringbuffer/vatomic.h index 38a232bf..d5784452 100644 --- a/wrapper/ringbuffer/vatomic.h +++ b/wrapper/ringbuffer/vatomic.h @@ -1,5 +1 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../lib/ringbuffer/vatomic.h" -#endif diff --git a/wrapper/ringbuffer/vfs.h b/wrapper/ringbuffer/vfs.h index 061b2ccb..f8e9ed94 100644 --- a/wrapper/ringbuffer/vfs.h +++ b/wrapper/ringbuffer/vfs.h @@ -1,5 +1 @@ -#ifdef CONFIG_LIB_RING_BUFFER -#include -#else #include "../../lib/ringbuffer/vfs.h" -#endif -- 2.34.1