X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fcompile%2Fctf-types%2Fust_tests_ctf_types.h;h=a0fb0b340c097b4cfd7c8358f8b262c399b0335d;hb=b4064f282fc27c80f17166b1439442d6ddd118b2;hp=4ce4d984ae524a7febe5d77a4342482a6b7831b8;hpb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;p=lttng-ust.git

diff --git a/tests/compile/ctf-types/ust_tests_ctf_types.h b/tests/compile/ctf-types/ust_tests_ctf_types.h
index 4ce4d984..a0fb0b34 100644
--- a/tests/compile/ctf-types/ust_tests_ctf_types.h
+++ b/tests/compile/ctf-types/ust_tests_ctf_types.h
@@ -4,16 +4,16 @@
  * Copyright (C) 2014 Geneviève Bastien <gbastien@versatic.net>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER ust_tests_ctf_types
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_ctf_types
 
-#if !defined(_TRACEPOINT_UST_TESTS_CTF_TYPES_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
+#if !defined(_TRACEPOINT_UST_TESTS_CTF_TYPES_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_CTF_TYPES_H
 
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_ENUM(ust_tests_ctf_types, testenum,
-	TP_ENUM_VALUES(
+LTTNG_UST_TRACEPOINT_ENUM(ust_tests_ctf_types, testenum,
+	LTTNG_UST_TP_ENUM_VALUES(
 		ctf_enum_value("even", 0)
 		ctf_enum_value("uneven", 1)
 		ctf_enum_range("twoto4", 2, 4)
@@ -21,8 +21,8 @@ TRACEPOINT_ENUM(ust_tests_ctf_types, testenum,
 	)
 )
 
-TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
-	TP_ENUM_VALUES(
+LTTNG_UST_TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
+	LTTNG_UST_TP_ENUM_VALUES(
 		ctf_enum_value("zero", 0)
 		ctf_enum_value("five", 5)
 		ctf_enum_range("ten_to_twenty", 10, 20)
@@ -33,10 +33,10 @@ TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
  * Enumeration field is used twice to make sure the type declaration
  * is entered only once in the metadata file.
  */
-TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
-	TP_ARGS(int, anint, int, enumval, int, enumval2),
-	TP_FIELDS(
-		ctf_integer(int, intfield, anint)
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
+	LTTNG_UST_TP_ARGS(int, anint, int, enumval, int, enumval2),
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_integer(int, intfield, anint)
 		ctf_enum(ust_tests_ctf_types, testenum, int, enumfield, enumval)
 		ctf_enum(ust_tests_ctf_types, testenum, long long,
 				enumfield_bis, enumval)
@@ -49,10 +49,10 @@ TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
  * Another tracepoint using the types to make sure each type is entered
  * only once in the metadata file.
  */
-TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis,
-	TP_ARGS(int, anint, int, enumval),
-	TP_FIELDS(
-		ctf_integer(int, intfield, anint)
+LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis,
+	LTTNG_UST_TP_ARGS(int, anint, int, enumval),
+	LTTNG_UST_TP_FIELDS(
+		lttng_ust_field_integer(int, intfield, anint)
 		ctf_enum(ust_tests_ctf_types, testenum, unsigned char,
 			enumfield, enumval)
 	)
@@ -60,8 +60,8 @@ TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis,
 
 #endif /* _TRACEPOINT_UST_TESTS_CTF_TYPES_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_ctf_types.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_ctf_types.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>