X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=libringbuffer%2Fbackend.h;h=bced86d96885950e4842a7c394508e86960a978c;hb=b4c8bf2f2320b7a2d19dec6addda5d6d2aa227a3;hp=dbb5d7353c878f670369f236f791971f664d691e;hpb=071dec4386ff4c89d8b0f92ab1a8dbf079abd50c;p=lttng-ust.git

diff --git a/libringbuffer/backend.h b/libringbuffer/backend.h
index dbb5d735..bced86d9 100644
--- a/libringbuffer/backend.h
+++ b/libringbuffer/backend.h
@@ -15,8 +15,6 @@
 #include <stddef.h>
 #include <unistd.h>
 
-#include "ust-helper.h"
-
 /* Internal helpers */
 #include "backend_internal.h"
 #include "frontend_internal.h"
@@ -25,12 +23,12 @@
 
 /* Ring buffer backend access (read/write) */
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern size_t lib_ring_buffer_read(struct lttng_ust_lib_ring_buffer_backend *bufb,
 				   size_t offset, void *dest, size_t len,
 				   struct lttng_ust_shm_handle *handle);
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern int lib_ring_buffer_read_cstr(struct lttng_ust_lib_ring_buffer_backend *bufb,
 				     size_t offset, void *dest, size_t len,
 				     struct lttng_ust_shm_handle *handle);
@@ -41,12 +39,13 @@ extern int lib_ring_buffer_read_cstr(struct lttng_ust_lib_ring_buffer_backend *b
  * it's never on a page boundary, it's safe to write directly to this address,
  * as long as the write is never bigger than a page size.
  */
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 extern void *
 lib_ring_buffer_offset_address(struct lttng_ust_lib_ring_buffer_backend *bufb,
 			       size_t offset,
 			       struct lttng_ust_shm_handle *handle);
-LTTNG_HIDDEN
+
+__attribute__((visibility("hidden")))
 extern void *
 lib_ring_buffer_read_offset_address(struct lttng_ust_lib_ring_buffer_backend *bufb,
 				    size_t offset,
@@ -138,7 +137,7 @@ size_t lib_ring_buffer_do_strcpy(const struct lttng_ust_lib_ring_buffer_config *
 static inline __attribute__((always_inline))
 void lib_ring_buffer_strcpy(const struct lttng_ust_lib_ring_buffer_config *config,
 			   struct lttng_ust_lib_ring_buffer_ctx *ctx,
-			   const char *src, size_t len, int pad)
+			   const char *src, size_t len, char pad)
 {
 	struct channel_backend *chanb = &ctx->chan->backend;
 	struct lttng_ust_shm_handle *handle = ctx->handle;
@@ -197,7 +196,7 @@ unsigned long lib_ring_buffer_get_records_unread(
 	struct lttng_ust_lib_ring_buffer_backend *bufb = &buf->backend;
 	unsigned long records_unread = 0, sb_bindex;
 	unsigned int i;
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 
 	chan = shmp(handle, bufb->chan);
 	if (!chan)