cleanup: Remove redefinition of CHAR_BIT

[lttng-ust.git] / liblttng-ust / lttng-context-cgroup-ns.c

diff --git a/liblttng-ust/lttng-context-cgroup-ns.c b/liblttng-ust/lttng-context-cgroup-ns.c
index a6741fb1886c37e273dd22120d86fac7d9991c0f..5c0394d332aec48ee1ba7ab32f4e0f1ee65ddf20 100644 (file)
--- a/liblttng-ust/lttng-context-cgroup-ns.c
+++ b/liblttng-ust/lttng-context-cgroup-ns.c
@@ -8,15 +8,16 @@
  */
 
 #define _LGPL_SOURCE
+#include <limits.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <lttng/ust-events.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ringbuffer-config.h>
 #include <ust-tid.h>
 #include <urcu/tls-compat.h>
+#include <lttng/ringbuffer-context.h>
 
 #include "context-internal.h"
 #include "lttng-tracer-core.h"
@@ -102,7 +103,7 @@ size_t cgroup_ns_get_size(struct lttng_ust_ctx_field *field, size_t offset)
 static
 void cgroup_ns_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)
 {
        ino_t cgroup_ns;
 
@@ -126,7 +127,7 @@ int lttng_add_cgroup_ns_to_ctx(struct lttng_ust_ctx **ctx)
 
        type = lttng_ust_create_type_integer(sizeof(ino_t) * CHAR_BIT,
                        lttng_alignof(ino_t) * CHAR_BIT,
-                       lttng_is_signed_type(ino_t),
+                       lttng_ust_is_signed_type(ino_t),
                        BYTE_ORDER, 10);
        if (!type)
                return -ENOMEM;