X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libcounter%2Fshm.c;h=b8a07e132d2985aaf7b0caace7368de2562f22e0;hb=8acb8bdfec7f1827ca762900e0fcbaa8f187742f;hp=efebbd0ebdc2ccd1e6e84520b078db66d1982b38;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/libcounter/shm.c b/libcounter/shm.c
index efebbd0e..b8a07e13 100644
--- a/libcounter/shm.c
+++ b/libcounter/shm.c
@@ -5,7 +5,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <config.h>
 #include "shm.h"
 #include <unistd.h>
 #include <fcntl.h>
@@ -17,15 +16,18 @@
 #include <stdio.h>
 #include <signal.h>
 #include <dirent.h>
-#include <lttng/align.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
+
 #ifdef HAVE_LIBNUMA
 #include <numa.h>
 #include <numaif.h>
 #endif
-#include <helper.h>
+
+#include <lttng/ust-utils.h>
+
+#include <ust-helper.h>
 #include <ust-fd.h>
 #include "../libringbuffer/mmap.h"
 
@@ -368,6 +370,6 @@ struct lttng_counter_shm_ref lttng_counter_zalloc_shm(struct lttng_counter_shm_o
 
 void lttng_counter_align_shm(struct lttng_counter_shm_object *obj, size_t align)
 {
-	size_t offset_len = offset_align(obj->allocated_len, align);
+	size_t offset_len = lttng_ust_offset_align(obj->allocated_len, align);
 	obj->allocated_len += offset_len;
 }