Change UST header location and update in tree headers

[lttng-tools.git] / lttng-sessiond / lttng-ust-abi.h

diff --git a/lttng-sessiond/lttng-ust-abi.h b/lttng-sessiond/lttng-ust-abi.h
index 5b025aeac5b30e6e7a514b9cbe7ffc1f4d99f58f..ced2929a232b732906353070a351e1f6df6faed1 100644 (file)
--- a/lttng-sessiond/lttng-ust-abi.h
+++ b/lttng-sessiond/lttng-ust-abi.h
@@ -2,7 +2,7 @@
 #define _LTTNG_UST_ABI_H
 
 /*
- * lttng-ust-abi.h
+ * lttng/ust-abi.h
  *
  * Copyright 2010-2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
@@ -139,9 +139,9 @@ struct lttng_ust_object_data {
 
 #define LTTNG_UST_ROOT_HANDLE  0
 
-struct obj;
+struct lttng_ust_obj;
 
-struct objd_ops {
+struct lttng_ust_objd_ops {
        long (*cmd)(int objd, unsigned int cmd, unsigned long arg);
        int (*release)(int objd);
 };
@@ -149,10 +149,10 @@ struct objd_ops {
 /* Create root handle. Always ID 0. */
 int lttng_abi_create_root_handle(void);
 
-const struct objd_ops *objd_ops(int id);
-int objd_unref(int id);
+const struct lttng_ust_objd_ops *objd_ops(int id);
+int lttng_ust_objd_unref(int id);
 
 void lttng_ust_abi_exit(void);
-void ltt_events_exit(void);
+void lttng_ust_events_exit(void);
 
 #endif /* _LTTNG_UST_ABI_H */