Tracepoint API namespacing 'TRACEPOINT_INCLUDE'

[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 5b48eedbb9277911d5af2ce2433ed346604e450f..459333c6ae309bc40258248e4b800f090d6fc924 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
@@ -7,7 +7,7 @@
 #undef TRACEPOINT_PROVIDER
 #define 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,7 +24,7 @@ TRACEPOINT_EVENT(lttng_jul, event,
                long, millis,
                int, log_level,
                int, thread_id),
-       TP_FIELDS(
+       LTTNG_UST_TP_FIELDS(
                ctf_string(msg, msg)
                ctf_string(logger_name, logger_name)
                ctf_string(class_name, class_name)
@@ -37,8 +37,8 @@ TRACEPOINT_EVENT(lttng_jul, event,
 
 #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>