X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fspawn-viewer.h;h=1221c5b08c51f21474282f9aa45efc343011ca84;hp=dc7b7bbcbb0340484c434d8aaa5f77add805bb1c;hb=b66cbf1731486ab4dc7e0b2e1c3fa05cc5360c19;hpb=729c1fec5976af17fded2f026725a08ef1924290

diff --git a/src/common/spawn-viewer.h b/src/common/spawn-viewer.h
index dc7b7bbcb..1221c5b08 100644
--- a/src/common/spawn-viewer.h
+++ b/src/common/spawn-viewer.h
@@ -11,10 +11,6 @@
 #include <lttng/lttng-export.h>
 #include <stdbool.h>
 
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
 /*
  * Read the trace by `exec()ing` the provided viewer program if any. If
  * `opt_viewer` is NULL, try to read the trace with the default trace reader.
@@ -25,10 +21,7 @@ extern "C" {
  * This symbol was mistakenly made public before the 2.12 release. It can't
  * be removed (but it can be stubbed-out if necessary).
  */
-LTTNG_EXPORT int spawn_viewer(const char *trace_path, char *opt_viewer, bool opt_live_mode);
-
-#if defined(__cplusplus)
-}
-#endif
+extern "C" LTTNG_EXPORT
+int spawn_viewer(const char *trace_path, char *opt_viewer, bool opt_live_mode);
 
 #endif /* ifndef LTTNG_SPAWN_VIEWER_H */