X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=libringbuffer%2Fringbuffer-config.h;h=37669b0d0b8e7e88a4d00c31ab547df740c703ee;hb=106ff4dab82c51bd7bf022220bf43f15fb04f8bc;hp=badf7566cf0329756c689a5ea9ce921c9a4fbf2b;hpb=7489fcb466935b3eeb36e99afbbb87188278cb91;p=lttng-ust.git

diff --git a/libringbuffer/ringbuffer-config.h b/libringbuffer/ringbuffer-config.h
index badf7566..37669b0d 100644
--- a/libringbuffer/ringbuffer-config.h
+++ b/libringbuffer/ringbuffer-config.h
@@ -16,14 +16,14 @@
 #include <urcu/arch.h>
 #include <string.h>
 
-#include <lttng/ust-align.h>
+#include <lttng/ust-utils.h>
 #include <lttng/ust-compiler.h>
 #include <lttng/ust-tracer.h>
 
 struct lttng_ust_lib_ring_buffer;
 struct lttng_ust_lib_ring_buffer_channel;
 struct lttng_ust_lib_ring_buffer_config;
-struct lttng_ust_lib_ring_buffer_ctx;
+struct lttng_ust_lib_ring_buffer_ctx_private;
 struct lttng_ust_shm_handle;
 
 /*
@@ -221,10 +221,11 @@ struct lttng_ust_lib_ring_buffer_config {
  * lib_ring_buffer_check_config() returns 0 on success.
  * Used internally to check for valid configurations at channel creation.
  */
-static inline lttng_ust_notrace
+static inline
 int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config *config,
 			     unsigned int switch_timer_interval,
-			     unsigned int read_timer_interval);
+			     unsigned int read_timer_interval)
+	lttng_ust_notrace;
 static inline
 int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config *config,
 			     unsigned int switch_timer_interval,