From: Mathieu Desnoyers Date: Tue, 15 May 2012 12:40:04 +0000 (-0400) Subject: Fix: remove # in front on extern "C" { X-Git-Tag: v2.1.0-rc1~86 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=9cc0a74872a3aa091faba829e54eeb204e68085f;p=lttng-ust.git Fix: remove # in front on extern "C" { Fails to compile with g++. Reported-by: Francis Giraldeau Signed-off-by: Mathieu Desnoyers --- diff --git a/doc/examples/easy-ust/sample_component_provider.h b/doc/examples/easy-ust/sample_component_provider.h index eefac0e6..764a9161 100644 --- a/doc/examples/easy-ust/sample_component_provider.h +++ b/doc/examples/easy-ust/sample_component_provider.h @@ -47,8 +47,8 @@ * works in c++. */ #ifdef __cplusplus -#extern "C"{ -#endif /*__cplusplus */ +extern "C" { +#endif /* __cplusplus */ /* * Add this precompiler conditionals to ensure the tracepoint event generation @@ -140,4 +140,4 @@ TRACEPOINT_LOGLEVEL( */ #ifdef __cplusplus } -#endif /*__cplusplus */ +#endif /* __cplusplus */ diff --git a/tools/lttng-gen-tp b/tools/lttng-gen-tp index 03a85fcb..d54559a0 100755 --- a/tools/lttng-gen-tp +++ b/tools/lttng-gen-tp @@ -35,8 +35,8 @@ class HeaderFile: #define TRACEPOINT_INCLUDE_FILE ./{headerFilename} #ifdef __cplusplus -#extern "C"{{ -#endif /*__cplusplus */ +extern "C"{{ +#endif /* __cplusplus */ #if !defined({includeGuard}) || defined(TRACEPOINT_HEADER_MULTI_READ) @@ -52,7 +52,7 @@ class HeaderFile: #ifdef __cplusplus }} -#endif /*__cplusplus */ +#endif /* __cplusplus */ """ def __init__(self, filename, template):