Move include/ust/ to include/lttng/

[lttng-ust.git] / libust / ltt-tracer-core.h

diff --git a/libust/ltt-tracer-core.h b/libust/ltt-tracer-core.h
index abab1734a13207234a0c0eaf1fc4f7129437a61c..20ed0c0e0ec7891182e43e28dcc27e54f69afd36 100644 (file)
--- a/libust/ltt-tracer-core.h
+++ b/libust/ltt-tracer-core.h
@@ -21,21 +21,20 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <ust/kcompat/kcompat.h>
-#include <ust/core.h>
+#include <lttng/kcompat/kcompat.h>
+#include <lttng/core.h>
+#include <lttng/ust-tracer.h>
 #include <urcu/list.h>
+#include <lttng/usterr-signal-safe.h>
+#include "lttng/bug.h"
 
-#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
-/* Align data on its natural alignment */
-#define RING_BUFFER_ALIGN
-#endif
-
-#include "usterr_signal_safe.h"
-#include "ust/bug.h"
-#include <ust/ringbuffer-config.h>
+#include <lttng/ringbuffer-config.h>
 
 struct ltt_session;
 struct ltt_channel;
 struct ltt_event;
 
+void ust_lock(void);
+void ust_unlock(void);
+
 #endif /* _LTT_TRACER_CORE_H */