X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-java-agent%2Fjni%2Flog4j%2Flttng_ust_log4j.h;h=16cbdc3b0b0a9462e942727718f4cf47f2a9f9b7;hb=b4064f282fc27c80f17166b1439442d6ddd118b2;hp=c7d7d5250eda16c5f4044dce98fe4c57f68e31af;hpb=3081c83f06d9a65cae1507a5db358df84ed7c192;p=lttng-ust.git

diff --git a/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h b/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h
index c7d7d525..16cbdc3b 100644
--- a/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h
+++ b/src/lib/lttng-ust-java-agent/jni/log4j/lttng_ust_log4j.h
@@ -4,10 +4,10 @@
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER lttng_log4j
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER lttng_log4j
 
-#if !defined(_TRACEPOINT_LTTNG_UST_LOG4J_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_LTTNG_UST_LOG4J_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_LOG4J_H
 
 #include <lttng/tracepoint.h>
@@ -15,8 +15,8 @@
 /*
  * Tracepoint used by Java applications using the log4j log appender.
  */
-TRACEPOINT_EVENT(lttng_log4j, event,
-	TP_ARGS(
+LTTNG_UST_TRACEPOINT_EVENT(lttng_log4j, event,
+	LTTNG_UST_TP_ARGS(
 		const char *, msg,
 		const char *, logger_name,
 		const char *, class_name,
@@ -26,23 +26,23 @@ TRACEPOINT_EVENT(lttng_log4j, event,
 		long, timestamp,
 		int, log_level,
 		const char *, thread_name),
-	TP_FIELDS(
+	LTTNG_UST_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_string(filename, file_name)
-		ctf_integer(int, line_number, line_number)
-		ctf_integer(long, timestamp, timestamp)
-		ctf_integer(int, int_loglevel, log_level)
+		lttng_ust_field_integer(int, line_number, line_number)
+		lttng_ust_field_integer(long, timestamp, timestamp)
+		lttng_ust_field_integer(int, int_loglevel, log_level)
 		ctf_string(thread_name, thread_name)
 	)
 )
 
 #endif /* _TRACEPOINT_LTTNG_UST_LOG4J_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./lttng_ust_log4j.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./lttng_ust_log4j.h"
 
 /* This part must be outside protection */
 #include <lttng/tracepoint-event.h>