Move LTTNG_RUNDIR declaration to lttng/lttng-sessiond-comm.h

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng-kconsumerd.h b/include/lttng-kconsumerd.h
index f6d1a0cc89b37ee8b6880bf8b7d6daf3aa63c79b..8dd57cff1e24d504a9834c0c8dcf4e3873e7da02 100644 (file)
--- a/include/lttng-kconsumerd.h
+++ b/include/lttng-kconsumerd.h
@@ -20,10 +20,11 @@
 #ifndef _LTTNG_KCONSUMERD_H
 #define _LTTNG_KCONSUMERD_H
 
+#include <lttng/lttng-sessiond-comm.h>
 #include "lttng-share.h"
 
 /* Kernel consumer path */
-#define KCONSUMERD_PATH                                                LTTNG_RUNDIR "/kconsumerd"
+#define KCONSUMERD_PATH                                        LTTNG_RUNDIR "/kconsumerd"
 #define KCONSUMERD_CMD_SOCK_PATH                       KCONSUMERD_PATH "/command"
 #define KCONSUMERD_ERR_SOCK_PATH                       KCONSUMERD_PATH "/error"
 

diff --git a/include/lttng-share.h b/include/lttng-share.h
index 7f82cf6a59caf226b8a12ef3313894c74747e250..9d3a259a6160b883f556137da29a5ae54fc325d8 100644 (file)
--- a/include/lttng-share.h
+++ b/include/lttng-share.h
@@ -27,8 +27,6 @@ typedef uint64_t u64;
 
 typedef __s64 s64;
 
-#define LTTNG_RUNDIR        "/var/run/lttng"
-
 /* Default channel attributes */
 #define DEFAULT_CHANNEL_NAME                "channel0"
 #define DEFAULT_CHANNEL_OVERWRITE           0       /* usec */

diff --git a/include/lttng/lttng-sessiond-comm.h b/include/lttng/lttng-sessiond-comm.h
index feff98c70bc3ef49d417c59640cc80d552b7b08f..67a305d1f86b61dd6abd6612454bce474ee6425a 100644 (file)
--- a/include/lttng/lttng-sessiond-comm.h
+++ b/include/lttng/lttng-sessiond-comm.h
@@ -29,6 +29,8 @@
 #include <limits.h>
 #include <lttng/lttng.h>
 
+#define LTTNG_RUNDIR        "/var/run/lttng"
+
 /* Default unix socket path */
 #define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK                LTTNG_RUNDIR "/client-ltt-sessiond"
 #define DEFAULT_GLOBAL_APPS_UNIX_SOCK          LTTNG_RUNDIR "/apps-ltt-sessiond"