X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Flib%2Flttng-ust-java-agent%2Fjni%2Flog4j%2Flttng_ust_log4j.h;h=c10145abdf2bbebdfccd3e980c95d882c39ba109;hb=3202f63a4d5e599bf22d6711828614b58c7efcba;hp=4aaa595682a9e3d1b705d466339242eac5c99d06;hpb=7f2f82c3b336458e815e9a4ed100d7084c9e7138;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 4aaa5956..c10145ab 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>
@@ -27,22 +27,22 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_log4j, event,
 		int, log_level,
 		const char *, thread_name),
 	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)
-		ctf_string(thread_name, thread_name)
+		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_string(filename, file_name)
+		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)
+		lttng_ust_field_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>