Fix: add extern "C" to two header files

[lttng-ust.git] / include / lttng / ust-ctl.h

diff --git a/include/lttng/ust-ctl.h b/include/lttng/ust-ctl.h
index d7ab7afd1594effb4ca4d045493bc0ef9ad4ce58..360bb09ab5d02dac0901963a11f208c1db4200df 100644 (file)
--- a/include/lttng/ust-ctl.h
+++ b/include/lttng/ust-ctl.h
@@ -18,6 +18,10 @@
 #include <lttng/ust-utils.h>
 #include <lttng/ust-sigbus.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifndef LTTNG_UST_UUID_LEN
 #define LTTNG_UST_UUID_LEN     16
 #endif
@@ -25,7 +29,7 @@
 /* Default unix socket path */
 #define LTTNG_UST_SOCK_FILENAME                                        \
        "lttng-ust-sock-"                                       \
-       lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+       lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE)
 
 /*
  * Shared memory files path are automatically related to shm root, e.g.
@@ -33,7 +37,7 @@
  */
 #define LTTNG_UST_WAIT_FILENAME                                        \
        "lttng-ust-wait-"                                       \
-       lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION)
+       lttng_ust_stringify(LTTNG_UST_ABI_MAJOR_VERSION_OLDEST_COMPATIBLE)
 
 struct lttng_ust_ctl_consumer_channel_attr {
        enum lttng_ust_abi_chan_type type;
@@ -656,4 +660,8 @@ int lttng_ust_ctl_counter_clear(struct lttng_ust_ctl_daemon_counter *counter,
 
 void lttng_ust_ctl_sigbus_handle(void *addr);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _LTTNG_UST_CTL_H */