Move include/ust/ to include/lttng/

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

diff --git a/libust/lttng-context-vpid.c b/libust/lttng-context-vpid.c
index 71395c95fd1892ea6ae33d14544e0404cb0f38ca..db76747a6445c9beb8cbd07ba0940b79fbb60e24 100644 (file)
--- a/libust/lttng-context-vpid.c
+++ b/libust/lttng-context-vpid.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__
 static inline
@@ -33,7 +33,7 @@ static pid_t cached_vpid;
 static inline
 pid_t wrapper_getpid(void)
 {
-       if (unlikely(!cached_vpid))
+       if (caa_unlikely(!cached_vpid))
                cached_vpid = getpid();
        return cached_vpid;
 }
@@ -60,7 +60,7 @@ size_t vpid_get_size(size_t offset)
 
 static
 void vpid_record(struct lttng_ctx_field *field,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_ust_lib_ring_buffer_ctx *ctx,
                 struct ltt_channel *chan)
 {
        pid_t pid;