X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust%2Fprobes%2Flttng-probe-ust.h;h=433d5dbfffee8a270ea2110bc297e1639b28e5b2;hb=e3426ddca52fbce55e62e063002ac25ca1f74f4e;hp=3394d086d59b7bee7504f397700d8212f69a2933;hpb=69400ac4a4e6575f749c6326df7c2a2c8ac3bdc5;p=lttng-ust.git

diff --git a/liblttng-ust/probes/lttng-probe-ust.h b/liblttng-ust/probes/lttng-probe-ust.h
index 3394d086..433d5dbf 100644
--- a/liblttng-ust/probes/lttng-probe-ust.h
+++ b/liblttng-ust/probes/lttng-probe-ust.h
@@ -1,5 +1,5 @@
-#undef TRACEPOINT_SYSTEM
-#define TRACEPOINT_SYSTEM lttng_ust
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER lttng_ust
 
 #if !defined(_TRACEPOINT_LTTNG_UST_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_H
@@ -24,11 +24,9 @@
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_metadata,
+TRACEPOINT_EVENT(lttng_ust, metadata,
 
-	TP_PROTO(const char *str),
-
-	TP_ARGS(str),
+	TP_ARGS(const char *, str),
 
 	/*
 	 * Not exactly a string: more a sequence of bytes (dynamic
@@ -40,12 +38,10 @@ TRACEPOINT_EVENT(lttng_metadata,
 	)
 )
 
-#undef TRACEPOINT_INCLUDE_PATH
-#define TRACEPOINT_INCLUDE_PATH ./probes
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE lttng-probe-ust
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./probes/lttng-probe-ust.h"
 
 #endif /* _TRACEPOINT_LTTNG_UST_H */
 
-/* This part must be outside protection */
+/* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>