From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 15 Aug 2013 18:21:41 +0000 (-0400)
Subject: examples: tracepoint probes don't need extern C
X-Git-Tag: v2.2.2~15
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=51bea6047ddaef11f23647ad948bc6f104b0642b;p=lttng-ust.git

examples: tracepoint probes don't need extern C

Fix all UST demo applications under doc/examples/

Fixes #597

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

diff --git a/doc/examples/demo/ust_tests_demo.h b/doc/examples/demo/ust_tests_demo.h
index b27d5399..750f510b 100644
--- a/doc/examples/demo/ust_tests_demo.h
+++ b/doc/examples/demo/ust_tests_demo.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
@@ -65,7 +61,3 @@ TRACEPOINT_MODEL_EMF_URI(ust_tests_demo, done,
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/doc/examples/demo/ust_tests_demo2.h b/doc/examples/demo/ust_tests_demo2.h
index 25d42ad1..eec0349e 100644
--- a/doc/examples/demo/ust_tests_demo2.h
+++ b/doc/examples/demo/ust_tests_demo2.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO2_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO2_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
@@ -62,7 +58,3 @@ TRACEPOINT_LOGLEVEL(ust_tests_demo2, loop, TRACE_WARNING)
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/doc/examples/demo/ust_tests_demo3.h b/doc/examples/demo/ust_tests_demo3.h
index c7b63dd8..232d577a 100644
--- a/doc/examples/demo/ust_tests_demo3.h
+++ b/doc/examples/demo/ust_tests_demo3.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_UST_TESTS_DEMO3_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_DEMO3_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
@@ -47,7 +43,3 @@ TRACEPOINT_LOGLEVEL(ust_tests_demo3, done, TRACE_WARNING)
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/doc/examples/easy-ust/sample_component_provider.h b/doc/examples/easy-ust/sample_component_provider.h
index 7e337825..dd3c5f0f 100644
--- a/doc/examples/easy-ust/sample_component_provider.h
+++ b/doc/examples/easy-ust/sample_component_provider.h
@@ -50,14 +50,6 @@
 #undef TRACEPOINT_INCLUDE
 #define TRACEPOINT_INCLUDE "./sample_component_provider.h"
 
-/*
- * Add this macro and its matching element to make sure the program
- * works in c++. 
- */
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /*
  * Add this precompiler conditionals to ensure the tracepoint event generation
  * can include this file more than once.
@@ -141,11 +133,3 @@ TRACEPOINT_LOGLEVEL(
  * Add this after defining the tracepoint events to expand the macros. 
  */ 
 #include <lttng/tracepoint-event.h>
-
-/*
- * Add this macro and its matching element to make sure the program
- * works in c++. 
- */
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
diff --git a/doc/examples/hello-static-lib/ust_tests_hello.h b/doc/examples/hello-static-lib/ust_tests_hello.h
index 35ea5f5d..e783feca 100644
--- a/doc/examples/hello-static-lib/ust_tests_hello.h
+++ b/doc/examples/hello-static-lib/ust_tests_hello.h
@@ -4,10 +4,6 @@
 #if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_HELLO_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
@@ -66,7 +62,3 @@ TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>
-
-#ifdef __cplusplus
-}
-#endif