X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-event.h;h=a12b758b2db9ca75cd14fedb3398d422d6950952;hb=bd9bb3c77252c984f8b6a7cbfb1d6ebbd069159c;hp=4630788c114625c7de68fdcbed122f69568bb63b;hpb=46d522007b647e0b64d18d0ed518205c2bbad424;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index 4630788c..a12b758b 100644
--- a/include/lttng/tracepoint-event.h
+++ b/include/lttng/tracepoint-event.h
@@ -22,10 +22,6 @@
 
 #ifdef TRACEPOINT_CREATE_PROBES
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #define __tp_stringify1(x)	#x
 #define __tp_stringify(x)	__tp_stringify1(x)
 
@@ -65,10 +61,32 @@ extern "C" {
 #undef TRACEPOINT_INCLUDE_FILE
 #undef TRACEPOINT_INCLUDE
 
-#ifdef __cplusplus
-}
-#endif
-
 #define TRACEPOINT_CREATE_PROBES
 
+/*
+ * Put back definitions to the state they were when defined by
+ * tracepoint.h.
+ */
+#undef TP_ARGS
+#define TP_ARGS(...)       __VA_ARGS__
+
+#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 */