X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=libust%2Fltt-tracer.h;h=6ab80e7c118a7c94d58388eb14c3a1d6411d5def;hb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;hp=0a94daa81b0ce58ebfe73eab6780a34f18ee5856;hpb=4fbf9cd1ede72e98638a5f81ecdce11416b4afea;p=lttng-ust.git

diff --git a/libust/ltt-tracer.h b/libust/ltt-tracer.h
index 0a94daa8..6ab80e7c 100644
--- 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 <lttng/core.h>
+#include <lttng/compat.h>
+#include <lttng/ust-events.h>
 #include "ltt-tracer-core.h"
-#include "ltt-events.h"
-
-#define LTTNG_VERSION 0
-#define LTTNG_PATCHLEVEL 9
-#define LTTNG_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