From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 17 Dec 2012 20:50:31 +0000 (-0500)
Subject: Adapt internal files and examples to TRACEPOINT_INCLUDE
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=45f399e86471695f8fb0f55d31197b02b3197bf9;p=lttng-ust.git

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 944efd08..7e337825 100644
--- 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 7a8b391c..8b9e9721 100644
--- 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 333e28e0..60b64d14 100644
--- 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 1c55ccd7..433d5dbf 100644
--- 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 79da6b74..2f468cbb 100755
--- 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"{{