X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Flttng%2Flttng.h;h=01c4089e532f0c1433977097d585ad16aac75f83;hb=48a4000561343808724f7cb5fa8c131877489ccd;hp=4736e8b344f5d5685a04f0a818802ee7c3468aaf;hpb=27993cc2e9edb3f5a59bc2c16439e063462235e5;p=lttng-tools.git

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index 4736e8b34..01c4089e5 100644
--- a/include/lttng/lttng.h
+++ b/include/lttng/lttng.h
@@ -42,10 +42,14 @@
 #include <lttng/event-expr.h>
 #include <lttng/event-field-value.h>
 #include <lttng/event-rule/event-rule.h>
-#include <lttng/event-rule/kernel-probe.h>
-#include <lttng/event-rule/syscall.h>
-#include <lttng/event-rule/tracepoint.h>
-#include <lttng/event-rule/userspace-probe.h>
+#include <lttng/event-rule/log4j-logging.h>
+#include <lttng/event-rule/jul-logging.h>
+#include <lttng/event-rule/kernel-kprobe.h>
+#include <lttng/event-rule/kernel-syscall.h>
+#include <lttng/event-rule/python-logging.h>
+#include <lttng/event-rule/kernel-tracepoint.h>
+#include <lttng/event-rule/kernel-uprobe.h>
+#include <lttng/event-rule/user-tracepoint.h>
 #include <lttng/event.h>
 #include <lttng/handle.h>
 #include <lttng/health.h>
@@ -144,8 +148,11 @@ extern int lttng_stop_tracing_no_wait(const char *session_name);
  * Deprecated: As of LTTng 2.9, this function always returns
  * -LTTNG_ERR_UND.
  */
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wshadow"
 extern int lttng_calibrate(struct lttng_handle *handle,
 		struct lttng_calibrate *calibrate);
+#pragma GCC diagnostic pop
 
 /*
  * Set URL for a consumer for a session and domain.