Tracepoint API namespacing ust-endian

[lttng-ust.git] / src / lib / lttng-ust / lttng-context-cpu-id.c

diff --git a/src/lib/lttng-ust/lttng-context-cpu-id.c b/src/lib/lttng-ust/lttng-context-cpu-id.c
index 900b3c2e526bf1d76945c40d9e952250b70a9838..0b87bd3c2455632c3a9b86c6134a8a38addf730f 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-cpu-id.c
+++ b/src/lib/lttng-ust/lttng-context-cpu-id.c
@@ -19,8 +19,8 @@
 #include <limits.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include "common/ringbuffer/getcpu.h"
-#include <lttng/ringbuffer-context.h>
+#include "lib/lttng-ust/getcpu.h"
+#include <lttng/ust-ringbuffer-context.h>
 
 #include "context-internal.h"
 
@@ -30,14 +30,14 @@ size_t cpu_id_get_size(void *priv __attribute__((unused)),
 {
        size_t size = 0;
 
-       size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(int));
+       size += lttng_ust_ring_buffer_align(offset, lttng_ust_rb_alignof(int));
        size += sizeof(int);
        return size;
 }
 
 static
 void cpu_id_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)
 {
        int cpu;
@@ -58,7 +58,7 @@ static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
                lttng_ust_static_type_integer(sizeof(int) * CHAR_BIT,
                                lttng_ust_rb_alignof(int) * CHAR_BIT,
                                lttng_ust_is_signed_type(int),
-                               BYTE_ORDER, 10),
+                               LTTNG_UST_BYTE_ORDER, 10),
                false, false),
        cpu_id_get_size,
        cpu_id_record,