X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-context-ip.c;h=00ed8b06acad41d3793153c056299471f2618713;hb=baa8acf3af23bc5d9373144bef8147744b5ae01f;hp=e9cc969fdc48a8488f9bddced3a2c048fe7aa6a3;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-context-ip.c b/src/lib/lttng-ust/lttng-context-ip.c
index e9cc969f..00ed8b06 100644
--- a/src/lib/lttng-ust/lttng-context-ip.c
+++ b/src/lib/lttng-ust/lttng-context-ip.c
@@ -13,7 +13,7 @@
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 
@@ -23,14 +23,14 @@ size_t ip_get_size(void *priv __attribute__((unused)),
 {
 	size_t size = 0;
 
-	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(void *));
+	size += lttng_ust_ring_buffer_align(offset, lttng_ust_rb_alignof(void *));
 	size += sizeof(void *);
 	return size;
 }
 
 static
 void ip_record(void *priv __attribute__((unused)),
-		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
+		 struct lttng_ust_ring_buffer_ctx *ctx,
 		 struct lttng_ust_channel_buffer *chan)
 {
 	void *ip;
@@ -44,7 +44,7 @@ static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
 		lttng_ust_static_type_integer(sizeof(void *) * CHAR_BIT,
 				lttng_ust_rb_alignof(void *) * CHAR_BIT,
 				lttng_ust_is_signed_type(void *),
-				BYTE_ORDER, 10),
+				LTTNG_UST_BYTE_ORDER, 10),
 		false, false),
 	ip_get_size,
 	ip_record,