Namespace remaining symbols in lttng/ringbuffer-context.h

[lttng-ust.git] / liblttng-ust / lttng-context-ip.c

diff --git a/liblttng-ust/lttng-context-ip.c b/liblttng-ust/lttng-context-ip.c
index 4b32dc3983eea987fd8b9fd8929d7ee6a9c6fd1f..b75c8a0150bb90a064e08027a1e4331d523fd881 100644 (file)
--- 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_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_alignof(ip));
        chan->ops->event_write(ctx, &ip, sizeof(ip));
 }
 
@@ -46,7 +47,7 @@ int lttng_add_ip_to_ctx(struct lttng_ust_ctx **ctx)
 
        type = lttng_ust_create_type_integer(sizeof(void *) * CHAR_BIT,
                        lttng_alignof(void *) * CHAR_BIT,
-                       lttng_is_signed_type(void *),
+                       lttng_ust_is_signed_type(void *),
                        BYTE_ORDER, 16);
        if (!type)
                return -ENOMEM;