X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Flttng%2Ftracepoint-event.h;h=24b387d30b8d32b185231854a1fe4a3b1f3e8071;hb=5dd0eb552909795b6047442e7749a5fa0d2bfdef;hp=a2f54066fe78e267dc217158dc40d8e2afe83420;hpb=5b393d6424d959e2efbb800b0c8a61b81bf9968e;p=lttng-ust.git

diff --git a/include/lttng/tracepoint-event.h b/include/lttng/tracepoint-event.h
index a2f54066..24b387d3 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)
@@ -51,6 +51,18 @@
 # 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) */
+
+#if LTTNG_UST_COMPAT_API(0)
+# if defined(TP_IP_PARAM) && !defined(LTTNG_UST_TP_IP_PARAM)
+#  define LTTNG_UST_TP_IP_PARAM
+# endif
+#endif /* #if LTTNG_UST_COMPAT_API(0) */
+
 #include LTTNG_UST_TRACEPOINT_INCLUDE
 
 #include <lttng/ust-tracepoint-event.h>