X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftracepoint-event.h;h=0bbecce84e4adaed6b683c805c5074f25f258933;hb=91fe3e1353806b798ce141de4481de115ea209fe;hp=545dcdc254351bd88fcafa7c95939f06f440873b;hpb=bb71a8ea3b2e7335393a6810887fb9b145cc6f7e;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index 545dcdc2..0bbecce8 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)
@@ -45,6 +45,18 @@
 # 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) */
+
+#if LTTNG_UST_COMPAT_API(0)
+# if defined(TP_SESSION_CHECK) && !defined(LTTNG_UST_TP_SESSION_CHECK)
+#  define LTTNG_UST_TP_SESSION_CHECK
+# endif
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
 #include LTTNG_UST_TRACEPOINT_INCLUDE
 
 #include <lttng/ust-tracepoint-event.h>