From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 9 Aug 2011 00:18:19 +0000 (-0400)
Subject: Move LTTNG_RUNDIR declaration to lttng/lttng-sessiond-comm.h
X-Git-Tag: v2.0-pre10~4
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=1526bda7e00a2bf7abbe2f189b7949b3fc8e07ad

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 f6d1a0cc8..8dd57cff1 100644
--- 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 7f82cf6a5..9d3a259a6 100644
--- 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 feff98c70..67a305d1f 100644
--- 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"