Fix: circular inclusion of lttng.h results in warning

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>

diff --git a/include/lttng/condition/condition.h b/include/lttng/condition/condition.h
index ae51e8a7a782e2c8773627dbd169e179af799d81..407a5f5ee521d277b6f659180461c1bb899bc84d 100644 (file)
--- a/include/lttng/condition/condition.h
+++ b/include/lttng/condition/condition.h
@@ -18,8 +18,6 @@
 #ifndef LTTNG_CONDITION_H
 #define LTTNG_CONDITION_H
 
 #ifndef LTTNG_CONDITION_H
 #define LTTNG_CONDITION_H
 

-#include <lttng/lttng.h>
-

 #ifdef __cplusplus
 extern "C" {
 #endif
 #ifdef __cplusplus
 extern "C" {
 #endif

diff --git a/tests/regression/tools/notification/base_client.c b/tests/regression/tools/notification/base_client.c
index 5d801282ce565762f28b0c305025e4037fcddce9..043952d4457eac8f717a110a5b4befa28c4b320b 100644 (file)
--- 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/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;
 
 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 de8734603fd309ba8d42db1cffac97015b5cd3e9..7af9258f983b4062dd52e088342f849c6edab27b 100644 (file)
--- 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/notification/channel.h>
 #include <lttng/notification/notification.h>
 #include <lttng/trigger/trigger.h>

+#include <lttng/lttng.h>

 
 #include <tap/tap.h>
 
 
 #include <tap/tap.h>