X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-context-ipc-ns.c;h=fcf6b0cc50106e0ac3f7d9831e1ae0d96c9d9c97;hb=b4064f282fc27c80f17166b1439442d6ddd118b2;hp=a122d4236e7c7bf7fedea20286530ffd3924c4b1;hpb=c5e8ef85e4c09e2f91a226195dc59f8b0bd6fd60;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-context-ipc-ns.c b/src/lib/lttng-ust/lttng-context-ipc-ns.c
index a122d423..fcf6b0cc 100644
--- a/src/lib/lttng-ust/lttng-context-ipc-ns.c
+++ b/src/lib/lttng-ust/lttng-context-ipc-ns.c
@@ -17,7 +17,7 @@
 #include <lttng/ust-tracer.h>
 #include "common/compat/tid.h"
 #include <urcu/tls-compat.h>
-#include <lttng/ringbuffer-context.h>
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "lttng-tracer-core.h"
@@ -95,14 +95,14 @@ size_t ipc_ns_get_size(void *priv __attribute__((unused)),
 {
 	size_t size = 0;
 
-	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(ino_t));
+	size += lttng_ust_ring_buffer_align(offset, lttng_ust_rb_alignof(ino_t));
 	size += sizeof(ino_t);
 	return size;
 }
 
 static
 void ipc_ns_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)
 {
 	ino_t ipc_ns;
@@ -123,7 +123,7 @@ const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
 		lttng_ust_static_type_integer(sizeof(ino_t) * CHAR_BIT,
 				lttng_ust_rb_alignof(ino_t) * CHAR_BIT,
 				lttng_ust_is_signed_type(ino_t),
-				BYTE_ORDER, 10),
+				LTTNG_UST_BYTE_ORDER, 10),
 		false, false),
 	ipc_ns_get_size,
 	ipc_ns_record,