X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-event.h;h=cf482b178071ad8276adf5bd7a6fd859f21b451d;hb=660323e630e752c98bf6124d54ff99777d05ce7d;hp=30e6523dc2f3200f5e23b112f3ae69fa50d7b2fb;hpb=6eddcb066dfe822dcf187715f35e7dbab84dabdf;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index 30e6523d..cf482b17 100644
--- a/include/lttng/tracepoint-event.h
+++ b/include/lttng/tracepoint-event.h
@@ -4,7 +4,16 @@
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#ifdef TRACEPOINT_CREATE_PROBES
+#include <lttng/ust-api-compat.h>
+
+
+#if LTTNG_UST_COMPAT_API(0)
+# if defined(TRACEPOINT_CREATE_PROBES) && !defined(LTTNG_UST_TRACEPOINT_CREATE_PROBES)
+#  define LTTNG_UST_TRACEPOINT_CREATE_PROBES
+# endif
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
+#ifdef LTTNG_UST_TRACEPOINT_CREATE_PROBES
 
 #define __tp_stringify1(x)	#x
 #define __tp_stringify(x)	__tp_stringify1(x)
@@ -20,7 +29,10 @@
 			LTTNG_UST__TP_PARAMS(_args))
 
 
+#undef LTTNG_UST_TRACEPOINT_CREATE_PROBES
+#if LTTNG_UST_COMPAT_API(0)
 #undef TRACEPOINT_CREATE_PROBES
+#endif
 
 #define TRACEPOINT_HEADER_MULTI_READ
 
@@ -31,7 +43,7 @@
 #undef TRACEPOINT_HEADER_MULTI_READ
 #undef TRACEPOINT_INCLUDE
 
-#define TRACEPOINT_CREATE_PROBES
+#define LTTNG_UST_TRACEPOINT_CREATE_PROBES
 
 /*
  * Put back definitions to the state they were when defined by
@@ -53,10 +65,10 @@
 	LTTNG_UST__DECLARE_TRACEPOINT(provider, name, LTTNG_UST__TP_PARAMS(args))		\
 	LTTNG_UST__DEFINE_TRACEPOINT(provider, name, LTTNG_UST__TP_PARAMS(args))
 
-#undef TRACEPOINT_LOGLEVEL
-#define TRACEPOINT_LOGLEVEL(provider, name, loglevel)
+#undef LTTNG_UST_TRACEPOINT_LOGLEVEL
+#define LTTNG_UST_TRACEPOINT_LOGLEVEL(provider, name, loglevel)
 
-#undef TRACEPOINT_MODEL_EMF_URI
-#define TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
+#undef LTTNG_UST_TRACEPOINT_MODEL_EMF_URI
+#define LTTNG_UST_TRACEPOINT_MODEL_EMF_URI(provider, name, uri)
 
-#endif /* TRACEPOINT_CREATE_PROBES */
+#endif /* LTTNG_UST_TRACEPOINT_CREATE_PROBES */