From: Michael Jeanson <mjeanson@efficios.com>
Date: Wed, 24 Mar 2021 23:05:55 +0000 (-0400)
Subject: fix: redundant decl of channel_destroy (-Wredundant-decls)
X-Git-Tag: v2.13.0-rc1~174
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=b89c5899ef86060111a6814c13df2684dc352737;p=lttng-ust.git

fix: redundant decl of channel_destroy (-Wredundant-decls)

Change-Id: If1ebe0225a848936bf94fb98edf19884909295ee
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/liblttng-ust/lttng-events.c b/liblttng-ust/lttng-events.c
index 6da3a1c9..e92d0574 100644
--- a/liblttng-ust/lttng-events.c
+++ b/liblttng-ust/lttng-events.c
@@ -54,6 +54,7 @@
 #include "wait.h"
 #include "../libringbuffer/shm.h"
 #include "../libringbuffer/frontend_types.h"
+#include "../libringbuffer/frontend.h"
 #include "../libcounter/counter.h"
 #include "jhash.h"
 #include <lttng/ust-abi.h>
diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index df404de7..77d2a06f 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -39,6 +39,7 @@
 #include <usterr-signal-safe.h>
 
 #include "../libringbuffer/frontend_types.h"
+#include "../libringbuffer/frontend.h"
 #include "../libringbuffer/shm.h"
 #include "../libcounter/counter.h"
 #include "tracepoint-internal.h"
diff --git a/libringbuffer/frontend.h b/libringbuffer/frontend.h
index 5e1ada15..c337eeca 100644
--- a/libringbuffer/frontend.h
+++ b/libringbuffer/frontend.h
@@ -59,7 +59,6 @@ struct lttng_ust_shm_handle *channel_create(const struct lttng_ust_lib_ring_buff
  * release all references, and destroys the channel.
  */
 __attribute__((visibility("hidden")))
-extern
 void channel_destroy(struct lttng_ust_lib_ring_buffer_channel *chan,
 		struct lttng_ust_shm_handle *handle,
 		int consumer);
diff --git a/libringbuffer/frontend_internal.h b/libringbuffer/frontend_internal.h
index 6e9d8be2..c0be36f5 100644
--- a/libringbuffer/frontend_internal.h
+++ b/libringbuffer/frontend_internal.h
@@ -20,6 +20,7 @@
 #include <lttng/ringbuffer-context.h>
 #include "ringbuffer-config.h"
 #include "backend_types.h"
+#include "backend_internal.h"
 #include "frontend_types.h"
 #include "shm.h"
 
diff --git a/libringbuffer/shm.h b/libringbuffer/shm.h
index dab0b68d..4889d6d6 100644
--- a/libringbuffer/shm.h
+++ b/libringbuffer/shm.h
@@ -30,12 +30,6 @@ int channel_handle_add_stream(struct lttng_ust_shm_handle *handle,
 __attribute__((visibility("hidden")))
 unsigned int channel_handle_get_nr_streams(struct lttng_ust_shm_handle *handle);
 
-__attribute__((visibility("hidden")))
-extern
-void channel_destroy(struct lttng_ust_lib_ring_buffer_channel *chan,
-		struct lttng_ust_shm_handle *handle,
-		int consumer);
-
 /*
  * Pointer dereferencing. We don't trust the shm_ref, so we validate
  * both the index and offset with known boundaries.