Tracepoint API namespacing ctf_string

[lttng-ust.git] / src / lib / lttng-ust-java-agent / jni / jul / lttng_ust_jul.h

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 dc941ef38140e0fee885756664a30a6781fd6196..c2e9fd3a19823913f24ac91c75fe9260fd0a28fe 100644 (file)
--- 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,8 +4,8 @@
  * 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(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_LTTNG_UST_JUL_H
@@ -25,20 +25,20 @@ LTTNG_UST_TRACEPOINT_EVENT(lttng_jul, event,
                int, log_level,
                int, thread_id),
        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_integer(long, long_millis, millis)
-               ctf_integer(int, int_loglevel, log_level)
-               ctf_integer(int, int_threadid, thread_id)
+               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>