X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-java-agent%2Fjni%2Fjul%2Flttng_ust_jul.h;h=c2e9fd3a19823913f24ac91c75fe9260fd0a28fe;hb=3202f63a4d5e599bf22d6711828614b58c7efcba;hp=5b48eedbb9277911d5af2ce2433ed346604e450f;hpb=cadfcbfcd89795086bfeb49af84dadc35154c754;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h
index 5b48eedb..c2e9fd3a 100644
--- a/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h
+++ b/src/lib/lttng-ust-java-agent/jni/jul/lttng_ust_jul.h
@@ -4,10 +4,10 @@
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_jul
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_jul
 
-#if !defined(_TRACEPOINT_LTTNG_UST_JUL_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_JUL_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_JUL_H
 
 #include <lttng/tracepoint.h>
@@ -15,7 +15,7 @@
 /*
  * Tracepoint used by Java applications using the JUL handler.
  */
-TRACEPOINT_EVENT(lttng_jul, event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_jul, event,
 	LTTNG_UST_TP_ARGS(
 		const char *, msg,
 		const char *, logger_name,
@@ -24,21 +24,21 @@ TRACEPOINT_EVENT(lttng_jul, event,
 		long, millis,
 		int, log_level,
 		int, thread_id),
-	TP_FIELDS(
-		ctf_string(msg, msg)
-		ctf_string(logger_name, logger_name)
-		ctf_string(class_name, class_name)
-		ctf_string(method_name, method_name)
-		ctf_integer(long, long_millis, millis)
-		ctf_integer(int, int_loglevel, log_level)
-		ctf_integer(int, int_threadid, thread_id)
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_string(msg, msg)
+		lttng_ust_field_string(logger_name, logger_name)
+		lttng_ust_field_string(class_name, class_name)
+		lttng_ust_field_string(method_name, method_name)
+		lttng_ust_field_integer(long, long_millis, millis)
+		lttng_ust_field_integer(int, int_loglevel, log_level)
+		lttng_ust_field_integer(int, int_threadid, thread_id)
 	)
 )
 
 #endif /* _TRACEPOINT_LTTNG_UST_JUL_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng_ust_jul.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng_ust_jul.h"
 
 /* This part must be outside protection */
 #include <lttng/tracepoint-event.h>