Fix: g++ 4.8 doesn't support non-trivial designated initializers

[lttng-tools.git] / src / common / spawn-viewer.h

diff --git a/src/common/spawn-viewer.h b/src/common/spawn-viewer.h
index 316fe19982372e0d64e6fc33c7aedbe10fa77347..1221c5b08c51f21474282f9aa45efc343011ca84 100644 (file)
--- a/src/common/spawn-viewer.h
+++ b/src/common/spawn-viewer.h
@@ -8,12 +8,9 @@
  *
  */
 
+#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.
@@ -24,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).
  */
+extern "C" LTTNG_EXPORT
 int spawn_viewer(const char *trace_path, char *opt_viewer, bool opt_live_mode);
 
-#if defined(__cplusplus)
-}
-#endif
-
 #endif /* ifndef LTTNG_SPAWN_VIEWER_H */