X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=liblttng-ust%2Flttng-context-veuid.c;h=d5ef5199498ba28c6914d606d18fb816cd50b445;hb=106ff4dab82c51bd7bf022220bf43f15fb04f8bc;hp=22c09c8214d7955964c388ea4c78704310ca79d9;hpb=0466ac28c41336fd6d373cc8b0b26ef132225b9f;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-veuid.c b/liblttng-ust/lttng-context-veuid.c
index 22c09c82..d5ef5199 100644
--- a/liblttng-ust/lttng-context-veuid.c
+++ b/liblttng-ust/lttng-context-veuid.c
@@ -8,6 +8,7 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -65,7 +66,7 @@ size_t veuid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(uid_t));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(uid_t));
 	size += sizeof(uid_t);
 	return size;
 }
@@ -73,13 +74,12 @@ size_t veuid_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void veuid_record(struct lttng_ust_ctx_field *field,
 		 struct lttng_ust_lib_ring_buffer_ctx *ctx,
-		 struct lttng_channel *chan)
+		 struct lttng_ust_channel_buffer *chan)
 {
 	uid_t veuid;
 
 	veuid = get_veuid();
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(veuid));
-	chan->ops->event_write(ctx, &veuid, sizeof(veuid));
+	chan->ops->event_write(ctx, &veuid, sizeof(veuid), lttng_ust_rb_alignof(veuid));
 }
 
 static
@@ -96,8 +96,8 @@ int lttng_add_veuid_to_ctx(struct lttng_ust_ctx **ctx)
 	int ret;
 
 	type = lttng_ust_create_type_integer(sizeof(uid_t) * CHAR_BIT,
-			lttng_alignof(uid_t) * CHAR_BIT,
-			lttng_is_signed_type(uid_t),
+			lttng_ust_rb_alignof(uid_t) * CHAR_BIT,
+			lttng_ust_is_signed_type(uid_t),
 			BYTE_ORDER, 10);
 	if (!type)
 		return -ENOMEM;