X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Flttng%2Fust-ctl.h;h=25e588b39a32f409da0f83de037b2205e2350624;hb=2137460a3901f8abdae909cf72e43e6ac23507ec;hp=d7ab7afd1594effb4ca4d045493bc0ef9ad4ce58;hpb=63b3205fe76018eb5d7656b94b54c9b662ae208f;p=lttng-ust.git

diff --git a/include/lttng/ust-ctl.h b/include/lttng/ust-ctl.h
index d7ab7afd..25e588b3 100644
--- a/include/lttng/ust-ctl.h
+++ b/include/lttng/ust-ctl.h
@@ -1,7 +1,7 @@
 /*
  * SPDX-License-Identifier: GPL-2.0-only
  *
- * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011-2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
@@ -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 */