X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust%2Flttng-context-vgid.c;h=c19be225a3a687137aa317af21db9a55559888af;hb=b4064f282fc27c80f17166b1439442d6ddd118b2;hp=e43d5bc2b03749372bc69e43de7da4197ea2103f;hpb=6339062a5bbe886493d0691d13e28e37a7206362;p=lttng-ust.git

diff --git a/src/lib/lttng-ust/lttng-context-vgid.c b/src/lib/lttng-ust/lttng-context-vgid.c
index e43d5bc2..c19be225 100644
--- a/src/lib/lttng-ust/lttng-context-vgid.c
+++ b/src/lib/lttng-ust/lttng-context-vgid.c
@@ -15,10 +15,10 @@
 #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"
-#include "creds.h"
+#include "common/creds.h"
 
 
 /*
@@ -67,14 +67,14 @@ size_t vgid_get_size(void *priv __attribute__((unused)),
 {
 	size_t size = 0;
 
-	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(gid_t));
+	size += lttng_ust_ring_buffer_align(offset, lttng_ust_rb_alignof(gid_t));
 	size += sizeof(gid_t);
 	return size;
 }
 
 static
 void vgid_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)
 {
 	gid_t vgid;
@@ -95,7 +95,7 @@ static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
 		lttng_ust_static_type_integer(sizeof(gid_t) * CHAR_BIT,
 				lttng_ust_rb_alignof(gid_t) * CHAR_BIT,
 				lttng_ust_is_signed_type(gid_t),
-				BYTE_ORDER, 10),
+				LTTNG_UST_BYTE_ORDER, 10),
 		false, false),
 	vgid_get_size,
 	vgid_record,