X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Flttng.h;h=efbd92f5dc404b49f3a2aad80c9c3386da0ba10a;hb=f895927f329180ca1e6f4426e9d3c6250ae698ba;hp=fc242c511585368b392cdcd712aec4b123a21aba;hpb=4f7da553ae57a6c947da2b9668c06418b2d50e99;p=lttng-tools.git

diff --git a/include/lttng/lttng.h b/include/lttng/lttng.h
index fc242c511..efbd92f5d 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/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/tracepoint.h>
-#include <lttng/event-rule/userspace-probe.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.
@@ -189,7 +196,7 @@ extern int lttng_data_pending(const char *session_name);
 /*
  * Deprecated, replaced by lttng_regenerate_metadata.
  */
-LTTNG_DEPRECATED()
+LTTNG_DEPRECATED("Use lttng_regenerate_metadata")
 extern int lttng_metadata_regenerate(const char *session_name);
 
 /*