Compile fix following moved headers

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng/ringbuffer-config.h b/include/lttng/ringbuffer-config.h
index 513da2f66b57cc51074ee5578b23423d339d2ebf..1ff5858c956e7197efadf8836fddb827360d494b 100644 (file)
--- a/include/lttng/ringbuffer-config.h
+++ b/include/lttng/ringbuffer-config.h
@@ -319,6 +319,4 @@ int lib_ring_buffer_check_config(const struct lttng_ust_lib_ring_buffer_config *
        return 0;
 }
 
-#include <lttng/vatomic.h>
-
 #endif /* _LINUX_RING_BUFFER_CONFIG_H */

diff --git a/liblttng-ust/ltt-probes.c b/liblttng-ust/ltt-probes.c
index 66ee971cc2d9dac7b1de6e85216ad78097efe4a5..fda35bf994104f9dc2d6b27b24d4a86f15375ce4 100644 (file)
--- a/liblttng-ust/ltt-probes.c
+++ b/liblttng-ust/ltt-probes.c
@@ -13,6 +13,7 @@
 #include <urcu/list.h>
 #include <lttng/core.h>
 #include <lttng/ust-events.h>
+#include <assert.h>
 
 #include "ltt-tracer-core.h"
 

diff --git a/libringbuffer/backend_types.h b/libringbuffer/backend_types.h
index 7417506e85d25e7ec36772979de86c3153b38baf..7300309f27ef97071354a8f4298ad7bed50d9f67 100644 (file)
--- a/libringbuffer/backend_types.h
+++ b/libringbuffer/backend_types.h
@@ -13,6 +13,7 @@
 
 #include <limits.h>
 #include "shm_internal.h"
+#include "vatomic.h"
 
 struct lttng_ust_lib_ring_buffer_backend_pages {
        unsigned long mmap_offset;      /* offset of the subbuffer in mmap */

diff --git a/libringbuffer/frontend_types.h b/libringbuffer/frontend_types.h
index 0a0488459d8e5fe7fc062a96915acaeaf959a231..9c733d170fe7fadfb8fa8fe8a958bc7ef4de6d43 100644 (file)
--- a/libringbuffer/frontend_types.h
+++ b/libringbuffer/frontend_types.h
@@ -27,6 +27,7 @@
 #include <lttng/ringbuffer-config.h>
 #include "backend_types.h"
 #include "shm_internal.h"
+#include "vatomic.h"
 
 /*
  * A switch is done during tracing or as a final flush after tracing (so it

diff --git a/tests/ust-basic-tracing/ust-basic-tracing.c b/tests/ust-basic-tracing/ust-basic-tracing.c
index 43628bd44cec2e1f4bd72dc88283ea7ca54929f3..ea0636bca03ada62cb2792184dda6bb3a31579b1 100644 (file)
--- a/tests/ust-basic-tracing/ust-basic-tracing.c
+++ b/tests/ust-basic-tracing/ust-basic-tracing.c
@@ -36,7 +36,7 @@
 #include <assert.h>
 #include <sys/socket.h>
 
-#include <lttng/ust-comm.h>
+#include <ust-comm.h>
 #include "../../libringbuffer/backend.h"
 #include "../../libringbuffer/frontend.h"
 

diff --git a/tests/ust-multi-test/ust-multi-test.c b/tests/ust-multi-test/ust-multi-test.c
index 541ed44b22bf04764099e808c36f99a15a02760d..b0ef25a48af2e6c8e8201dc6e6adfb28d907c941 100644 (file)
--- a/tests/ust-multi-test/ust-multi-test.c
+++ b/tests/ust-multi-test/ust-multi-test.c
@@ -36,7 +36,7 @@
 #include <assert.h>
 #include <sys/socket.h>
 
-#include <lttng/ust-comm.h>
+#include <ust-comm.h>
 #include <../../libringbuffer/backend.h>
 #include <../../libringbuffer/frontend.h>