Move include/ust/ to include/lttng/

[lttng-ust.git] / libust / lttng-context-vtid.c

diff --git a/libust/lttng-context-vtid.c b/libust/lttng-context-vtid.c
index a7e1c81de80174d998c52bfd301c0418eec17aff..6f7e078d22d2910072748adfd0ee59b8c9a695b4 100644 (file)
--- a/libust/lttng-context-vtid.c
+++ b/libust/lttng-context-vtid.c
@@ -9,9 +9,9 @@
 
 #include <sys/types.h>
 #include <unistd.h>
-#include <ust/lttng-events.h>
-#include <ust/lttng-tracer.h>
-#include <ust/ringbuffer-config.h>
+#include <lttng/ust-events.h>
+#include <lttng/ust-tracer.h>
+#include <lttng/ringbuffer-config.h>
 
 #ifdef __linux__
 #include <syscall.h>
@@ -60,10 +60,10 @@ size_t vtid_get_size(size_t offset)
 
 static
 void vtid_record(struct lttng_ctx_field *field,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_ust_lib_ring_buffer_ctx *ctx,
                 struct ltt_channel *chan)
 {
-       if (unlikely(!cached_vtid))
+       if (caa_unlikely(!cached_vtid))
                cached_vtid = gettid();
        lib_ring_buffer_align_ctx(ctx, lttng_alignof(cached_vtid));
        chan->ops->event_write(ctx, &cached_vtid, sizeof(cached_vtid));