From 534b3ed8dd2a11b8fc7228cfe053ffdaad6e18fb Mon Sep 17 00:00:00 2001
From: David Goulet <dgoulet@efficios.com>
Date: Thu, 21 Mar 2013 13:12:23 -0400
Subject: [PATCH] Fix: wrong header path when compiling without UST support

Signed-off-by: David Goulet <dgoulet@efficios.com>
---
 src/bin/lttng-sessiond/buffer-registry.h | 2 +-
 src/bin/lttng-sessiond/lttng-ust-abi.h   | 4 +++-
 src/bin/lttng-sessiond/lttng-ust-ctl.h   | 3 ++-
 src/bin/lttng-sessiond/lttng-ust-error.h | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/bin/lttng-sessiond/buffer-registry.h b/src/bin/lttng-sessiond/buffer-registry.h
index 4b19f7190..486b675f4 100644
--- a/src/bin/lttng-sessiond/buffer-registry.h
+++ b/src/bin/lttng-sessiond/buffer-registry.h
@@ -19,13 +19,13 @@
 #define LTTNG_BUFFER_REGISTRY_H
 
 #include <stdint.h>
-#include <lttng/ust-ctl.h>
 #include <urcu/list.h>
 
 #include <lttng/lttng.h>
 #include <common/hashtable/hashtable.h>
 
 #include "consumer.h"
+#include "ust-ctl.h"
 #include "ust-registry.h"
 
 struct buffer_reg_stream {
diff --git a/src/bin/lttng-sessiond/lttng-ust-abi.h b/src/bin/lttng-sessiond/lttng-ust-abi.h
index df61cde57..03d2e65f6 100644
--- a/src/bin/lttng-sessiond/lttng-ust-abi.h
+++ b/src/bin/lttng-sessiond/lttng-ust-abi.h
@@ -28,7 +28,9 @@
  */
 
 #include <stdint.h>
-#include <lttng/ust-compiler.h>
+
+#define lttng_ust_notrace __attribute__((no_instrument_function))
+#define LTTNG_PACKED    __attribute__((__packed__))
 
 #ifndef __ust_stringify
 #define __ust_stringify1(x)	#x
diff --git a/src/bin/lttng-sessiond/lttng-ust-ctl.h b/src/bin/lttng-sessiond/lttng-ust-ctl.h
index fc5c79474..7f59b8666 100644
--- a/src/bin/lttng-sessiond/lttng-ust-ctl.h
+++ b/src/bin/lttng-sessiond/lttng-ust-ctl.h
@@ -19,9 +19,10 @@
 #ifndef _LTTNG_UST_CTL_H
 #define _LTTNG_UST_CTL_H
 
-#include <lttng/ust-abi.h>
 #include <sys/types.h>
 
+#include "lttng-ust-abi.h"
+
 #ifndef LTTNG_UST_UUID_LEN
 #define LTTNG_UST_UUID_LEN	16
 #endif
diff --git a/src/bin/lttng-sessiond/lttng-ust-error.h b/src/bin/lttng-sessiond/lttng-ust-error.h
index 05cc3bee6..d9062c0a8 100644
--- a/src/bin/lttng-sessiond/lttng-ust-error.h
+++ b/src/bin/lttng-sessiond/lttng-ust-error.h
@@ -28,7 +28,8 @@
 
 #include <limits.h>
 #include <unistd.h>
-#include <lttng/ust-abi.h>
+
+#include "lttng-ust-abi.h"
 
 /*
  * ustcomm error code.
-- 
2.34.1