From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 15 Nov 2011 00:19:12 +0000 (-0500)
Subject: Fix multiple probe generation into one single C file
X-Git-Tag: v1.9.1~98
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9e0e41bf1e9f61e8c30a6e45391596a5ac6c2ceb;p=lttng-ust.git

Fix multiple probe generation into one single C file

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

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index b487370b..ffc37c17 100644
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -245,6 +245,17 @@ static void __attribute__((destructor)) __tracepoints__destroy(void)
 	tracepoint_unregister_lib(__start___tracepoints_ptrs);
 }
 
+#ifdef __cplusplus 
+}
+#endif
+
+#endif /* _LTTNG_TRACEPOINT_H */
+
+/*
+ * For multiple probe generation, we need to redefine TRACEPOINT_EVENT
+ * each time tracepoint.h is included.
+ */
+
 #ifndef TRACEPOINT_EVENT
 /*
  * Usage of the TRACEPOINT_EVENT macro:
@@ -448,9 +459,3 @@ static void __attribute__((destructor)) __tracepoints__destroy(void)
 #define TRACEPOINT_LOGLEVEL(name, loglevel)
 
 #endif /* #ifndef TRACEPOINT_LOGLEVEL */
-
-#ifdef __cplusplus 
-}
-#endif
-
-#endif /* _LTTNG_TRACEPOINT_H */