Adapt internal files and examples to TRACEPOINT_INCLUDE

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/doc/examples/easy-ust/sample_component_provider.h b/doc/examples/easy-ust/sample_component_provider.h
index 944efd08d32692092b11cfa1a4c0926e451cbc8f..7e337825e734525e955c2c2dc6afd65ea0fc984b 100644 (file)
--- a/doc/examples/easy-ust/sample_component_provider.h
+++ b/doc/examples/easy-ust/sample_component_provider.h
@@ -47,8 +47,8 @@
 /*
  * include file (this files's name)
  */
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./sample_component_provider.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./sample_component_provider.h"
 
 /*
  * Add this macro and its matching element to make sure the program

diff --git a/liblttng-ust-java/lttng_ust_java.h b/liblttng-ust-java/lttng_ust_java.h
index 7a8b391c61e5fa2f0a69085e1e76168b9a2b0e85..8b9e9721a611b68ea7b62a4eac88d1f67359ad66 100644 (file)
--- a/liblttng-ust-java/lttng_ust_java.h
+++ b/liblttng-ust-java/lttng_ust_java.h
@@ -68,8 +68,8 @@ TRACEPOINT_EVENT(lttng_ust_java, string_event,
 
 #endif /* _TRACEPOINT_LTTNG_UST_JAVA_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./lttng_ust_java.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./lttng_ust_java.h"
 
 /* This part must be outside protection */
 #include <lttng/tracepoint-event.h>

diff --git a/liblttng-ust-libc-wrapper/ust_libc.h b/liblttng-ust-libc-wrapper/ust_libc.h
index 333e28e03a5a1cc868562d2958c97983011e2e98..60b64d14c6e6d7bef08af67e9e72034fe75cfbe7 100644 (file)
--- a/liblttng-ust-libc-wrapper/ust_libc.h
+++ b/liblttng-ust-libc-wrapper/ust_libc.h
@@ -49,8 +49,8 @@ TRACEPOINT_EVENT(ust_libc, free,
 
 #endif /* _TRACEPOINT_UST_LIBC_H */
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./ust_libc.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./ust_libc.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>

diff --git a/liblttng-ust/probes/lttng-probe-ust.h b/liblttng-ust/probes/lttng-probe-ust.h
index 1c55ccd74c8a7a2a60bbf18d51a71031880363e1..433d5dbfffee8a270ea2110bc297e1639b28e5b2 100644 (file)
--- a/liblttng-ust/probes/lttng-probe-ust.h
+++ b/liblttng-ust/probes/lttng-probe-ust.h
@@ -38,8 +38,8 @@ TRACEPOINT_EVENT(lttng_ust, metadata,
        )
 )
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./probes/lttng-probe-ust.h
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./probes/lttng-probe-ust.h"
 
 #endif /* _TRACEPOINT_LTTNG_UST_H */
 

diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp
index 79da6b74bbe0b5c123150a04759d56f3164f3bbb..2f468cbb79abde4fbf580208cc4728df91af548a 100755 (executable)
--- a/tools/lttng-gen-tp
+++ b/tools/lttng-gen-tp
@@ -31,8 +31,8 @@ class HeaderFile:
 #undef TRACEPOINT_PROVIDER
 #define TRACEPOINT_PROVIDER {providerName}
 
-#undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ./{headerFilename}
+#undef TRACEPOINT_INCLUDE
+#define TRACEPOINT_INCLUDE "./{headerFilename}"
 
 #ifdef __cplusplus
 extern "C"{{