From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 18 Oct 2016 22:43:04 +0000 (-0400)
Subject: Fix: loglevel and model_emf_uri build fix
X-Git-Tag: v2.10.0-rc1~37
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=082802f9e5efe64195520826743ea9c23e4ea1b7;p=lttng-ust.git

Fix: loglevel and model_emf_uri build fix

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

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 2bb4a38e..15399c7c 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -865,9 +865,7 @@ LTTNG_TP_EXTERN_C const int *_loglevel___##__provider##___##__name	   \
 
 #include TRACEPOINT_INCLUDE
 
-#ifdef __cplusplus
 #undef LTTNG_TP_EXTERN_C
-#endif
 
 /*
  * Stage 6.1 of tracepoint event generation.
@@ -893,13 +891,11 @@ LTTNG_TP_EXTERN_C const int *_loglevel___##__provider##___##__name	   \
 #undef TRACEPOINT_MODEL_EMF_URI
 #define TRACEPOINT_MODEL_EMF_URI(__provider, __name, __uri)		   \
 LTTNG_TP_EXTERN_C const char *_model_emf_uri___##__provider##___##__name   \
-		__attribute__((visibility("hidden"))) = __uri		   \
+		__attribute__((visibility("hidden"))) = __uri;		   \
 
 #include TRACEPOINT_INCLUDE
 
-#ifdef __cplusplus
 #undef LTTNG_TP_EXTERN_C
-#endif
 
 /*
  * Stage 7.1 of tracepoint event generation.