cleanup: Remove redefinition of CHAR_BIT

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

diff --git a/liblttng-ust/lttng-context-cpu-id.c b/liblttng-ust/lttng-context-cpu-id.c
index cdcfe1a1574fe473ab1a4dd0c64dcd622188cc74..8636b1ba3a78d703e7748b3dda1985c0e173bb77 100644 (file)
--- a/liblttng-ust/lttng-context-cpu-id.c
+++ b/liblttng-ust/lttng-context-cpu-id.c
@@ -16,10 +16,11 @@
 #include <stddef.h>
 #include <sys/types.h>
 #include <unistd.h>
+#include <limits.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
 #include "../libringbuffer/getcpu.h"
+#include <lttng/ringbuffer-context.h>
 
 #include "context-internal.h"
 
@@ -36,7 +37,7 @@ size_t cpu_id_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void cpu_id_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)
 {
        int cpu;
 
@@ -60,7 +61,7 @@ int lttng_add_cpu_id_to_ctx(struct lttng_ust_ctx **ctx)
 
        type = lttng_ust_create_type_integer(sizeof(int) * CHAR_BIT,
                        lttng_alignof(int) * CHAR_BIT,
-                       lttng_is_signed_type(int),
+                       lttng_ust_is_signed_type(int),
                        BYTE_ORDER, 10);
        if (!type)
                return -ENOMEM;