Move include/ust/ to include/lttng/

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

diff --git a/libust/ltt-tracer.h b/libust/ltt-tracer.h
index a79c5f76ed2c78c498f2034cb4e69bde4df6fd3c..6ab80e7c118a7c94d58388eb14c3a1d6411d5def 100644 (file)
--- a/libust/ltt-tracer.h
+++ b/libust/ltt-tracer.h
@@ -25,32 +25,24 @@
 
 #include <stdarg.h>
 #include <stdint.h>
-#include <ust/core.h>
-#include <ust/compat.h>
-#include <ust/lttng-events.h>
+#include <lttng/core.h>
+#include <lttng/compat.h>
+#include <lttng/ust-events.h>
 #include "ltt-tracer-core.h"
 
-#define LTTNG_UST_VERSION 0
-#define LTTNG_UST_PATCHLEVEL 9
-#define LTTNG_UST_SUBLEVEL 1
-
-#ifndef CHAR_BIT
-#define CHAR_BIT 8
-#endif
-
 /* Number of bytes to log with a read/write event */
 #define LTT_LOG_RW_SIZE                        32L
 #define LTT_MAX_SMALL_SIZE             0xFFFFU
 
-#ifdef RING_BUFFER_ALIGN
-#define ltt_alignof(type)      __alignof__(type)
-#else
-#define ltt_alignof(type)      1
-#endif
-
 /* Tracer properties */
 #define CTF_MAGIC_NUMBER               0xC1FC1FC1
 #define TSDL_MAGIC_NUMBER              0x75D11D57
+
+/* CTF specification version followed */
+#define CTF_SPEC_MAJOR                 1
+#define CTF_SPEC_MINOR                 8
+
+/* Tracer major/minor versions */
 #define CTF_VERSION_MAJOR              0
 #define CTF_VERSION_MINOR              1