Tracepoint API namespacing ust-endian

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

diff --git a/src/lib/lttng-ust/lttng-context-pthread-id.c b/src/lib/lttng-ust/lttng-context-pthread-id.c
index da02d1a862b1d58a52d09f999cfde1c9fa6f479b..af98816b4d5801001bbbb02ae1967938ea97a9a0 100644 (file)
--- a/src/lib/lttng-ust/lttng-context-pthread-id.c
+++ b/src/lib/lttng-ust/lttng-context-pthread-id.c
@@ -12,7 +12,7 @@
 #include <pthread.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"
 
@@ -22,14 +22,14 @@ size_t pthread_id_get_size(void *priv __attribute__((unused)),
 {
        size_t size = 0;
 
-       size += lttng_ust_lib_ring_buffer_align(offset, lttng_ust_rb_alignof(unsigned long));
+       size += lttng_ust_ring_buffer_align(offset, lttng_ust_rb_alignof(unsigned long));
        size += sizeof(unsigned long);
        return size;
 }
 
 static
 void pthread_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)
 {
        unsigned long pthread_id;
@@ -50,7 +50,7 @@ static const struct lttng_ust_ctx_field *ctx_field = lttng_ust_static_ctx_field(
                lttng_ust_static_type_integer(sizeof(unsigned long) * CHAR_BIT,
                                lttng_ust_rb_alignof(unsigned long) * CHAR_BIT,
                                lttng_ust_is_signed_type(unsigned long),
-                               BYTE_ORDER, 10),
+                               LTTNG_UST_BYTE_ORDER, 10),
                false, false),
        pthread_id_get_size,
        pthread_id_record,