Fix: use LIBDL/LIBC_DL to select either libdl or libc

[lttng-ust.git] / include / lttng / tracepoint-event.h

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index 077eaa0b46d48fcf1baa0d35f4b188246275fd85..a12b758b2db9ca75cd14fedb3398d422d6950952 100644 (file)
--- a/include/lttng/tracepoint-event.h
+++ b/include/lttng/tracepoint-event.h
@@ -20,10 +20,6 @@
  * SOFTWARE.
  */
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifdef TRACEPOINT_CREATE_PROBES
 
 #define __tp_stringify1(x)     #x
@@ -67,8 +63,30 @@ extern "C" {
 
 #define TRACEPOINT_CREATE_PROBES
 
-#endif /* TRACEPOINT_CREATE_PROBES */
+/*
+ * Put back definitions to the state they were when defined by
+ * tracepoint.h.
+ */
+#undef TP_ARGS
+#define TP_ARGS(...)       __VA_ARGS__
 
-#ifdef __cplusplus
-}
-#endif
+#undef TRACEPOINT_EVENT
+#define TRACEPOINT_EVENT(provider, name, args, fields)                 \
+       _DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args))           \
+       _DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args))
+
+#undef TRACEPOINT_EVENT_CLASS
+#define TRACEPOINT_EVENT_CLASS(provider, name, args, fields)
+
+#undef TRACEPOINT_EVENT_INSTANCE
+#define TRACEPOINT_EVENT_INSTANCE(provider, _template, name, args)     \
+       _DECLARE_TRACEPOINT(provider, name, _TP_PARAMS(args))           \
+       _DEFINE_TRACEPOINT(provider, name, _TP_PARAMS(args))
+
+#undef TRACEPOINT_LOGLEVEL
+#define TRACEPOINT_LOGLEVEL(provider, name, loglevel)
+
+#undef TRACEPOINT_MODEL_EMF_URI
+#define TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
+
+#endif /* TRACEPOINT_CREATE_PROBES */