X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-tracer-core.h;h=a292dae578e6628ccb31dc43781f012d4c850a60;hb=73f94b3ce6a9531a7c4d8b178b417fa58da35d66;hp=59b2700ee357b364b2e22a8475e67e611494c161;hpb=ddabe860f4cf41a4206a8157d83e6b9354f85cb5;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-tracer-core.h b/liblttng-ust/lttng-tracer-core.h
index 59b2700e..a292dae5 100644
--- a/liblttng-ust/lttng-tracer-core.h
+++ b/liblttng-ust/lttng-tracer-core.h
@@ -13,8 +13,7 @@
 #include <urcu/arch.h>
 #include <urcu/list.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/bug.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
 #include <usterr-signal-safe.h>
 
 /*
@@ -25,12 +24,12 @@
  */
 #define LTTNG_PROC_NS_PATH_MAX 40
 
-struct lttng_session;
+struct lttng_ust_session;
 struct lttng_channel;
 struct lttng_event;
-struct lttng_ctx_field;
+struct lttng_ust_ctx_field;
 struct lttng_ust_lib_ring_buffer_ctx;
-struct lttng_ctx_value;
+struct lttng_ust_ctx_value;
 struct lttng_ust_event_notifier;
 
 __attribute__((visibility("hidden")))
@@ -88,15 +87,15 @@ __attribute__((visibility("hidden")))
 ssize_t lttng_ust_read(int fd, void *buf, size_t len);
 
 __attribute__((visibility("hidden")))
-size_t lttng_ust_dummy_get_size(struct lttng_ctx_field *field, size_t offset);
+size_t lttng_ust_dummy_get_size(struct lttng_ust_ctx_field *field, size_t offset);
 
 __attribute__((visibility("hidden")))
-void lttng_ust_dummy_record(struct lttng_ctx_field *field,
+void lttng_ust_dummy_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
 		 struct lttng_channel *chan);
 __attribute__((visibility("hidden")))
-void lttng_ust_dummy_get_value(struct lttng_ctx_field *field,
-		struct lttng_ctx_value *value);
+void lttng_ust_dummy_get_value(struct lttng_ust_ctx_field *field,
+		struct lttng_ust_ctx_value *value);
 
 __attribute__((visibility("hidden")))
 void lttng_event_notifier_notification_send(