From 25040abcb14b44939248abeea1103282c0a6e416 Mon Sep 17 00:00:00 2001
From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?=
 <jeremie.galarneau@efficios.com>
Date: Wed, 20 Dec 2017 14:52:33 -0500
Subject: [PATCH] Fix: circular inclusion of lttng.h results in warning
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The circular inclusion of lttng.h, which includes all
public headers, from condition.h results in the following
warning for users of the API:

warning: ‘struct lttng_evaluation’ declared inside
parameter list will not be visible outside of this definition
or declaration

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 include/lttng/condition/condition.h                | 2 --
 tests/regression/tools/notification/base_client.c  | 1 +
 tests/regression/tools/notification/notification.c | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/lttng/condition/condition.h b/include/lttng/condition/condition.h
index ae51e8a7a..407a5f5ee 100644
--- a/include/lttng/condition/condition.h
+++ b/include/lttng/condition/condition.h
@@ -18,8 +18,6 @@
 #ifndef LTTNG_CONDITION_H
 #define LTTNG_CONDITION_H
 
-#include <lttng/lttng.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/tests/regression/tools/notification/base_client.c b/tests/regression/tools/notification/base_client.c
index 5d801282c..043952d44 100644
--- a/tests/regression/tools/notification/base_client.c
+++ b/tests/regression/tools/notification/base_client.c
@@ -41,6 +41,7 @@
 #include <lttng/notification/channel.h>
 #include <lttng/notification/notification.h>
 #include <lttng/trigger/trigger.h>
+#include <lttng/lttng-error.h>
 
 static unsigned int nr_notifications = 0;
 static unsigned int nr_expected_notifications = 0;
diff --git a/tests/regression/tools/notification/notification.c b/tests/regression/tools/notification/notification.c
index de8734603..7af9258f9 100644
--- a/tests/regression/tools/notification/notification.c
+++ b/tests/regression/tools/notification/notification.c
@@ -50,6 +50,7 @@
 #include <lttng/notification/channel.h>
 #include <lttng/notification/notification.h>
 #include <lttng/trigger/trigger.h>
+#include <lttng/lttng.h>
 
 #include <tap/tap.h>
 
-- 
2.34.1