X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libringbuffer%2Fbackend_internal.h;h=60c97d42ec29d4c9080dcc6ed075f87527a7422e;hb=f69fe5fb0a2b0c581f0562bdd04ab2a003d239f9;hp=9e57a6c6059fb20b85575c6687d3fff9bfa15ae6;hpb=2b7080aa8c2481a3a316c98702884c902a01bde5;p=lttng-ust.git

diff --git a/libringbuffer/backend_internal.h b/libringbuffer/backend_internal.h
index 9e57a6c6..60c97d42 100644
--- a/libringbuffer/backend_internal.h
+++ b/libringbuffer/backend_internal.h
@@ -18,44 +18,50 @@
 #include "backend_types.h"
 #include "frontend_types.h"
 #include "shm.h"
-#include "ust-helper.h"
 
 /* Ring buffer backend API presented to the frontend */
 
 /* Ring buffer and channel backend create/free */
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 int lib_ring_buffer_backend_create(struct lttng_ust_lib_ring_buffer_backend *bufb,
-				   struct channel_backend *chan, int cpu,
+				   struct channel_backend *chan,
+				   int cpu,
 				   struct lttng_ust_shm_handle *handle,
 				   struct shm_object *shmobj);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 void channel_backend_unregister_notifiers(struct channel_backend *chanb);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 void lib_ring_buffer_backend_free(struct lttng_ust_lib_ring_buffer_backend *bufb);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 int channel_backend_init(struct channel_backend *chanb,
 			 const char *name,
 			 const struct lttng_ust_lib_ring_buffer_config *config,
 			 size_t subbuf_size,
 			 size_t num_subbuf, struct lttng_ust_shm_handle *handle,
 			 const int *stream_fds);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 void channel_backend_free(struct channel_backend *chanb,
 			  struct lttng_ust_shm_handle *handle);
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 void lib_ring_buffer_backend_reset(struct lttng_ust_lib_ring_buffer_backend *bufb,
 				   struct lttng_ust_shm_handle *handle);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 void channel_backend_reset(struct channel_backend *chanb);
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 int lib_ring_buffer_backend_init(void);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 void lib_ring_buffer_backend_exit(void);
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern void _lib_ring_buffer_write(struct lttng_ust_lib_ring_buffer_backend *bufb,
 				   size_t offset, const void *src, size_t len,
 				   ssize_t pagecpy);
@@ -279,7 +285,7 @@ void subbuffer_consume_record(const struct lttng_ust_lib_ring_buffer_config *con
 			      struct lttng_ust_shm_handle *handle)
 {
 	unsigned long sb_bindex;
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	struct lttng_ust_lib_ring_buffer_backend_pages_shmp *pages_shmp;
 	struct lttng_ust_lib_ring_buffer_backend_pages *backend_pages;
 
@@ -499,7 +505,7 @@ void lib_ring_buffer_set_noref_offset(const struct lttng_ust_lib_ring_buffer_con
 				      struct lttng_ust_shm_handle *handle)
 {
 	struct lttng_ust_lib_ring_buffer_backend_subbuffer *wsb;
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 
 	if (config->mode != RING_BUFFER_OVERWRITE)
 		return;
@@ -549,7 +555,7 @@ int update_read_sb_index(const struct lttng_ust_lib_ring_buffer_config *config,
 		return -EPERM;
 
 	if (config->mode == RING_BUFFER_OVERWRITE) {
-		struct channel *chan;
+		struct lttng_ust_lib_ring_buffer_channel *chan;
 
 		/*
 		 * Exchange the target writer subbuffer with our own unused