Fix: wrong header path when compiling without UST support

Signed-off-by: David Goulet <dgoulet@efficios.com>

diff --git a/src/bin/lttng-sessiond/buffer-registry.h b/src/bin/lttng-sessiond/buffer-registry.h
index 4b19f7190f17189b17ce54e3db5d368d4e5ac1e3..486b675f4a4bbfdbe8a636ebab953dceb37f4bf1 100644 (file)
--- 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 df61cde57c5c0005bb6e72c7d2ccdcbea4d19c2d..03d2e65f6059ed4bd6359ef10f860fd7c79c95ac 100644 (file)
--- 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 fc5c794743646f5b38fb0b0b4eb5014732fdbd64..7f59b86665523610b30a9d561ff326ef36521ca2 100644 (file)
--- 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 05cc3bee65e2dd61a87c3907bda010e444c85680..d9062c0a866946d2bef52881b8bf64233d41b00c 100644 (file)
--- 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.