X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Flttng-context-ip.c;h=29ca29e2ce16e030136cbd39fcf60cc72aa01112;hb=b62f8205216d20d7ef16b536efd81389dc6fdd2f;hp=4b32dc3983eea987fd8b9fd8929d7ee6a9c6fd1f;hpb=a084756d092167324ee09d3f819cc45407b58233;p=lttng-ust.git

diff --git a/liblttng-ust/lttng-context-ip.c b/liblttng-ust/lttng-context-ip.c
index 4b32dc39..29ca29e2 100644
--- a/liblttng-ust/lttng-context-ip.c
+++ b/liblttng-ust/lttng-context-ip.c
@@ -7,12 +7,13 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
+#include <lttng/ringbuffer-context.h>
 
 #include "context-internal.h"
 
@@ -21,7 +22,7 @@ size_t ip_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 {
 	size_t size = 0;
 
-	size += lib_ring_buffer_align(offset, lttng_alignof(void *));
+	size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(void *));
 	size += sizeof(void *);
 	return size;
 }
@@ -29,12 +30,12 @@ size_t ip_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void ip_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)
 {
 	void *ip;
 
 	ip = ctx->ip;
-	lib_ring_buffer_align_ctx(ctx, lttng_alignof(ip));
+	lttng_ust_lib_ring_buffer_align_ctx(ctx, lttng_ust_rb_alignof(ip));
 	chan->ops->event_write(ctx, &ip, sizeof(ip));
 }
 
@@ -45,8 +46,8 @@ int lttng_add_ip_to_ctx(struct lttng_ust_ctx **ctx)
 	int ret;
 
 	type = lttng_ust_create_type_integer(sizeof(void *) * CHAR_BIT,
-			lttng_alignof(void *) * CHAR_BIT,
-			lttng_is_signed_type(void *),
+			lttng_ust_rb_alignof(void *) * CHAR_BIT,
+			lttng_ust_is_signed_type(void *),
 			BYTE_ORDER, 16);
 	if (!type)
 		return -ENOMEM;