X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=libcounter%2Fcounter.c;h=fae7266cde315364ff6ca1d61c47bc666e625392;hb=c53279a3e7796da67c5ad8d5e5657bf03def2dcb;hp=640705d32d4bdc7d2f8e50d951c781bf17d633cf;hpb=00adec46a40302f315a5d18b3f4b601beb6cd059;p=lttng-ust.git

diff --git a/libcounter/counter.c b/libcounter/counter.c
index 640705d3..fae7266c 100644
--- a/libcounter/counter.c
+++ b/libcounter/counter.c
@@ -5,18 +5,18 @@
  * Copyright (C) 2020 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#define _GNU_SOURCE
 #include <errno.h>
 #include "counter.h"
 #include "counter-internal.h"
-#include <lttng/bitmap.h>
 #include <urcu/system.h>
 #include <urcu/compiler.h>
 #include <stdbool.h>
-#include <helper.h>
-#include <lttng/align.h>
+#include <ust-helper.h>
 #include "smp.h"
 #include "shm.h"
+#include "ust-compat.h"
+
+#include "ust-bitmap.h"
 
 static size_t lttng_counter_get_dimension_nr_elements(struct lib_counter_dimension *dimension)
 {
@@ -188,7 +188,7 @@ int validate_args(const struct lib_counter_config *config,
 		return -1;
 	if (!(config->alloc & COUNTER_ALLOC_PER_CPU) && counter_cpu_fds)
 		return -1;
-	if (!(config->alloc & COUNTER_ALLOC_PER_CPU) && counter_cpu_fds >= 0)
+	if (!(config->alloc & COUNTER_ALLOC_PER_CPU) && nr_counter_cpu_fds >= 0)
 		return -1;
 	if (counter_cpu_fds && nr_cpus != nr_counter_cpu_fds)
 		return -1;