From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Thu, 24 Oct 2019 00:27:12 +0000 (-0400)
Subject: sessiond: build fails in --without-lttng-ust configuration
X-Git-Tag: v2.12.0-rc1~278
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=fe7de4bfe0b8c1ea69f8b53ad7d670876710c70c

sessiond: build fails in --without-lttng-ust configuration

The include of macros.h was changed when syncing with the latest
usb-abi.h header and caused the build to fail in the
--without-lttng-ust configuration.

Changed the include to refer to common/macros.h.

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/ust-abi-internal.h b/src/bin/lttng-sessiond/ust-abi-internal.h
index 4cc3eafc2..8944d0593 100644
--- a/src/bin/lttng-sessiond/ust-abi-internal.h
+++ b/src/bin/lttng-sessiond/ust-abi-internal.h
@@ -28,7 +28,7 @@
 #define LTTNG_UST_ABI_INTERNAL_H
 
 #include <stdint.h>
-#include <macros.h>
+#include <common/macros.h>
 
 #ifndef LTTNG_PACKED
 #error "LTTNG_PACKED should be defined"