X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-java%2Flttng_ust_java.h;h=08381e059dc671703bc29e847e998b286881e3a6;hb=bb71a8ea3b2e7335393a6810887fb9b145cc6f7e;hp=847260c5ba43caf12ec056bce7d8ab9c0429c825;hpb=cadfcbfcd89795086bfeb49af84dadc35154c754;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-java/lttng_ust_java.h b/src/lib/lttng-ust-java/lttng_ust_java.h
index 847260c5..08381e05 100644
--- a/src/lib/lttng-ust-java/lttng_ust_java.h
+++ b/src/lib/lttng-ust-java/lttng_ust_java.h
@@ -7,48 +7,48 @@
 #undef TRACEPOINT_PROVIDER
 #define TRACEPOINT_PROVIDER lttng_ust_java
 
-#if !defined(_TRACEPOINT_LTTNG_UST_JAVA_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_JAVA_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_JAVA_H
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(lttng_ust_java, int_event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, int_event,
 	LTTNG_UST_TP_ARGS(const char *, name, int, payload),
-	TP_FIELDS(
+	LTTNG_UST_TP_FIELDS(
 		ctf_string(name, name)
 		ctf_integer(int, int_payload, payload)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_java, int_int_event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, int_int_event,
 	LTTNG_UST_TP_ARGS(const char *, name, int, payload1, int, payload2),
-	TP_FIELDS(
+	LTTNG_UST_TP_FIELDS(
 		ctf_string(name, name)
 		ctf_integer(int, int_payload1, payload1)
 		ctf_integer(int, int_payload2, payload2)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_java, long_event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, long_event,
 	LTTNG_UST_TP_ARGS(const char *, name, long, payload),
-	TP_FIELDS(
+	LTTNG_UST_TP_FIELDS(
 		ctf_string(name, name)
 		ctf_integer(long, long_payload, payload)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_java, long_long_event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, long_long_event,
 	LTTNG_UST_TP_ARGS(const char *, name, long, payload1, long, payload2),
-	TP_FIELDS(
+	LTTNG_UST_TP_FIELDS(
 		ctf_string(name, name)
 		ctf_integer(long, long_payload1, payload1)
 		ctf_integer(long, long_payload2, payload2)
 	)
 )
 
-TRACEPOINT_EVENT(lttng_ust_java, string_event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_ust_java, string_event,
 	LTTNG_UST_TP_ARGS(const char *, name, const char *, payload),
-	TP_FIELDS(
+	LTTNG_UST_TP_FIELDS(
 		ctf_string(name, name)
 		ctf_string(string_payload, payload)
 	)
@@ -56,8 +56,8 @@ TRACEPOINT_EVENT(lttng_ust_java, string_event,
 
 #endif /* _TRACEPOINT_LTTNG_UST_JAVA_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng_ust_java.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng_ust_java.h"
 
 /* This part must be outside protection */
 #include <lttng/tracepoint-event.h>