From 3e06faf99109742d88c13732c54da07f21c9a93a Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Wed, 24 Jul 2024 17:14:44 +0000
Subject: [PATCH] Fix: sessiond: missing include causes multiple conflicting
 definitions
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

clang-tidy reports that
/root/lttng-tools/src/bin/lttng-sessiond/ust-ctl-internal.hpp:346:3: error: redefinition of 'LTTNG_PACKED' with a different type: 'struct lttng_ust_ctl_integer_type' vs 'struct lttng_ust_ctl_consumer_channel_attr' [clang-diagnostic-error]
  346 | } LTTNG_PACKED;

Indeed, that header is missing macros.hpp causing LTTNG_PACKED
to be misinterpreted.

Change-Id: I9a0ec916e7ad1c4d926f4d9a33dd6a85fb5b809c
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 src/bin/lttng-sessiond/ust-ctl-internal.hpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/bin/lttng-sessiond/ust-ctl-internal.hpp b/src/bin/lttng-sessiond/ust-ctl-internal.hpp
index 79e07d9e8..bb2b31868 100644
--- a/src/bin/lttng-sessiond/ust-ctl-internal.hpp
+++ b/src/bin/lttng-sessiond/ust-ctl-internal.hpp
@@ -11,6 +11,8 @@
 
 #include "lttng-ust-abi.hpp"
 
+#include <common/macros.hpp>
+
 #include <limits.h>
 #include <sys/types.h>
 
-- 
2.34.1