Move include/ust/ to include/lttng/

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

diff --git a/libust/lttng-context-procname.c b/libust/lttng-context-procname.c
index 2056d1941aa52484e5f16df60c43ea15bf077e65..b9bae82eba91be79fdd2ca1749fe2e5f2066b570 100644 (file)
--- a/libust/lttng-context-procname.c
+++ b/libust/lttng-context-procname.c
@@ -8,9 +8,9 @@
  */
 
 #include <sys/prctl.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>
 #include <assert.h>
 
 #define PROCNAME_LEN   17      /* includes \0 */
@@ -28,7 +28,7 @@ char *wrapper_getprocname(void)
 {
        int ret;
 
-       if (unlikely(!cached_procname[0])) {
+       if (caa_unlikely(!cached_procname[0])) {
                ret = prctl(PR_GET_NAME, (unsigned long) cached_procname,
                        0, 0, 0);
                assert(!ret);
@@ -52,7 +52,7 @@ size_t procname_get_size(size_t offset)
 
 static
 void procname_record(struct lttng_ctx_field *field,
-                struct lib_ring_buffer_ctx *ctx,
+                struct lttng_ust_lib_ring_buffer_ctx *ctx,
                 struct ltt_channel *chan)
 {
        char *procname;