X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=liblttng-ust%2Fprobes%2Flttng-probe-ust.h;h=1c55ccd74c8a7a2a60bbf18d51a71031880363e1;hb=167ff4df850ed5c954ee374db66a04b1c9a4ef34;hp=c8525fd92c3c743e090b8a9e3e2d547723dd63b2;hpb=39f98c62fa2eb208bc24230dc2d669132e08a1fa;p=lttng-ust.git

diff --git a/liblttng-ust/probes/lttng-probe-ust.h b/liblttng-ust/probes/lttng-probe-ust.h
index c8525fd9..1c55ccd7 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_VARS(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
+#define TRACEPOINT_INCLUDE_FILE ./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>