From: David Goulet <david.goulet@polymtl.ca>
Date: Mon, 26 Sep 2011 22:32:45 +0000 (-0400)
Subject: Fix UST define in global headers
X-Git-Tag: v2.0-pre14~11
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=28ca4a8b53068907137724e2e078b29cecf525f7

Fix UST define in global headers

Signed-off-by: David Goulet <david.goulet@polymtl.ca>
---

diff --git a/include/lttng-share.h b/include/lttng-share.h
index f6169bfd0..78abff6ae 100644
--- a/include/lttng-share.h
+++ b/include/lttng-share.h
@@ -21,6 +21,8 @@
 
 #include <stdlib.h>
 
+#include <lttng/lttng.h>
+
 /* Default channel attributes */
 #define DEFAULT_CHANNEL_NAME            "channel0"
 #define DEFAULT_CHANNEL_OVERWRITE       0       /* usec */
@@ -50,6 +52,8 @@
 #define DEFAULT_UST_CHANNEL_SUBBUF_SIZE     4096    /* bytes */
 /* Must be a power of 2 */
 #define DEFAULT_UST_CHANNEL_SUBBUF_NUM      4
+/* See lttng-ust.h enum lttng_ust_output */
+#define DEFAULT_UST_CHANNEL_OUTPUT          LTTNG_UST_MMAP
 
 /*
  * Takes a pointer x and transform it so we can use it to access members
diff --git a/include/lttng-ust.h b/include/lttng-ust.h
index b61c320d5..b7143f871 100644
--- a/include/lttng-ust.h
+++ b/include/lttng-ust.h
@@ -19,9 +19,6 @@
 #define LTTNG_UST_COMM_VERSION_MAJOR   0
 #define LTTNG_UST_COMM_VERSION_MINOR   1
 
-/* See lttng-ust.h enum lttng_ust_output */
-#define DEFAULT_UST_CHANNEL_OUTPUT     LTTNG_UST_MMAP
-
 enum lttng_ust_instrumentation {
 	LTTNG_UST_TRACEPOINT    = 0,
 	LTTNG_UST_PROBE         = 1,