X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-event.h;h=4044339d255e421aa2d8d9d1d2a7687b16856b5d;hb=061fc37ae64a1ad3ecefe10d9a2db33ebb5c41ce;hp=639a05db0c21cc98bcbd797cff0970e8d8fdc435;hpb=c2c72ddee62023174ab8c130c0b51800a8fb01e9;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index 639a05db..4044339d 100644
--- a/include/lttng/tracepoint-event.h
+++ b/include/lttng/tracepoint-event.h
@@ -15,8 +15,8 @@
 
 #ifdef LTTNG_UST_TRACEPOINT_CREATE_PROBES
 
-#define __tp_stringify1(x)	#x
-#define __tp_stringify(x)	__tp_stringify1(x)
+#define lttng_ust__tp_stringify1(x)	#x
+#define lttng_ust__tp_stringify(x)	lttng_ust__tp_stringify1(x)
 
 #undef LTTNG_UST_TRACEPOINT_EVENT_INSTANCE
 #define LTTNG_UST_TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
@@ -39,7 +39,19 @@
 #define TRACEPOINT_HEADER_MULTI_READ
 #endif
 
-#include TRACEPOINT_INCLUDE
+#if LTTNG_UST_COMPAT_API(0)
+# if defined(TRACEPOINT_INCLUDE) && !defined(LTTNG_UST_TRACEPOINT_INCLUDE)
+#  define LTTNG_UST_TRACEPOINT_INCLUDE TRACEPOINT_INCLUDE
+# endif
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
+#if LTTNG_UST_COMPAT_API(0)
+# if defined(TRACEPOINT_PROVIDER) && !defined(LTTNG_UST_TRACEPOINT_PROVIDER)
+#  define LTTNG_UST_TRACEPOINT_PROVIDER TRACEPOINT_PROVIDER
+# endif
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
+#include LTTNG_UST_TRACEPOINT_INCLUDE
 
 #include <lttng/ust-tracepoint-event.h>
 
@@ -48,7 +60,10 @@
 #undef TRACEPOINT_HEADER_MULTI_READ
 #endif
 
-#undef TRACEPOINT_INCLUDE
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#if LTTNG_UST_COMPAT_API(0)
+# undef TRACEPOINT_INCLUDE
+#endif
 
 #define LTTNG_UST_TRACEPOINT_CREATE_PROBES