Fix: C++: incomplete extern C guard transition

Recently, commits to fix SDT issues with extern C
(https://bugs.lttng.org/issues/597) brougt in compile errors when the
tracepoint is defined in the same file where the tracepoint provider is
created.

This was due to the presence of extern C guards in tracepoint-event.h, a
header dedicated to tracepoint probe provider compilation. After commits
"Tracepoint probes don't need extern C", it should have gone away. This
is the main fix done by this patch.

This patch also adds missing extern C guards in ust-error.h and
ust-events.h.

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

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index 4630788c114625c7de68fdcbed122f69568bb63b..c1ca31c85e11a64d0f5b0b5080e08282a06cec58 100644 (file)
--- a/include/lttng/tracepoint-event.h
+++ b/include/lttng/tracepoint-event.h
@@ -22,10 +22,6 @@
 
 #ifdef TRACEPOINT_CREATE_PROBES
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define __tp_stringify1(x)     #x
 #define __tp_stringify(x)      __tp_stringify1(x)
 
@@ -65,10 +61,6 @@ extern "C" {
 #undef TRACEPOINT_INCLUDE_FILE
 #undef TRACEPOINT_INCLUDE
 
-#ifdef __cplusplus
-}
-#endif
-
 #define TRACEPOINT_CREATE_PROBES
 
 #endif /* TRACEPOINT_CREATE_PROBES */

diff --git a/include/lttng/ust-error.h b/include/lttng/ust-error.h
index 05cc3bee65e2dd61a87c3907bda010e444c85680..cbcb5ebd161a9dd85acc421c3e7705a9b1989bf8 100644 (file)
--- a/include/lttng/ust-error.h
+++ b/include/lttng/ust-error.h
@@ -30,6 +30,10 @@
 #include <unistd.h>
 #include <lttng/ust-abi.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /*
  * ustcomm error code.
  */
@@ -57,4 +61,8 @@ enum lttng_ust_error_code {
  */
 extern const char *lttng_ust_strerror(int code);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _LTTNG_UST_ERROR_H */

diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index d541f81f3445a3c37068ad362ea6c06522394e25..ac412624054e16da6a0bc822ab03f82364e208b3 100644 (file)
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -35,6 +35,10 @@
 #include <lttng/ust-endian.h>
 #include <float.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define LTTNG_UST_UUID_LEN             16
 
 /*
@@ -613,4 +617,8 @@ typedef int (*t_statedump_func_ptr)(struct lttng_session *session);
 void lttng_handle_pending_statedump(void *owner);
 struct cds_list_head *_lttng_get_sessions(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _LTTNG_UST_EVENTS_H */