X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-java-agent%2Fjni%2Flog4j%2Flttng_ust_log4j.h;h=bf92c5e47427e83831c8e55afee22ea265469bb7;hb=bb71a8ea3b2e7335393a6810887fb9b145cc6f7e;hp=b06a44a64f7273cba302629cdff5a0a1733d81e2;hpb=cadfcbfcd89795086bfeb49af84dadc35154c754;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 b06a44a6..bf92c5e4 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
@@ -7,7 +7,7 @@
 #undef TRACEPOINT_PROVIDER
 #define 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,7 +15,7 @@
 /*
  * Tracepoint used by Java applications using the log4j log appender.
  */
-TRACEPOINT_EVENT(lttng_log4j, event,
+LTTNG_UST_TRACEPOINT_EVENT(lttng_log4j, event,
 	LTTNG_UST_TP_ARGS(
 		const char *, msg,
 		const char *, logger_name,
@@ -26,7 +26,7 @@ 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)
@@ -41,8 +41,8 @@ TRACEPOINT_EVENT(lttng_log4j, event,
 
 #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>