X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-ust-abi.c;h=7953176335a6e0c4f9c30b2ec28d798fb790f5fd;hb=5198080d2234eb06e95d245d0a9747810f496475;hp=1b21b80e50ea7b1453b126a0becb90eb6a0db033;hpb=fd17d7cecd427479c035cd99cb2b2fb622bb3a38;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-ust-abi.c b/liblttng-ust/lttng-ust-abi.c
index 1b21b80e..79531763 100644
--- a/liblttng-ust/lttng-ust-abi.c
+++ b/liblttng-ust/lttng-ust-abi.c
@@ -30,7 +30,6 @@
 #include <urcu/compiler.h>
 #include <urcu/list.h>
 
-#include <ust-helper.h>
 #include <lttng/tracepoint.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-error.h>
@@ -47,6 +46,7 @@
 #include "string-utils.h"
 #include "ust-events-internal.h"
 #include "context-internal.h"
+#include "ust-helper.h"
 
 #define OBJ_NAME_LEN	16
 
@@ -289,7 +289,7 @@ int lttng_abi_create_root_handle(void)
 static
 int lttng_is_channel_ready(struct lttng_channel *lttng_chan)
 {
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	unsigned int nr_streams, exp_streams;
 
 	chan = lttng_chan->chan;
@@ -449,7 +449,7 @@ int lttng_abi_map_channel(int session_objd,
 	int chan_objd;
 	struct lttng_ust_shm_handle *channel_handle;
 	struct lttng_channel *lttng_chan;
-	struct channel *chan;
+	struct lttng_ust_lib_ring_buffer_channel *chan;
 	struct lttng_ust_lib_ring_buffer_config *config;
 	void *chan_data;
 	int wakeup_fd;
@@ -522,7 +522,7 @@ int lttng_abi_map_channel(int session_objd,
 		ret = -EINVAL;
 		goto notransport;
 	}
-	transport = lttng_transport_find(transport_name);
+	transport = lttng_ust_transport_find(transport_name);
 	if (!transport) {
 		DBG("LTTng transport %s not found\n",
 		       transport_name);
@@ -762,7 +762,7 @@ long lttng_event_notifier_group_error_counter_cmd(int objd, unsigned int cmd, un
 	return ret;
 }
 
-LTTNG_HIDDEN
+__attribute__((visibility("hidden")))
 int lttng_release_event_notifier_group_error_counter(int objd)
 {
 	struct lttng_counter *counter = objd_private(objd);