X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fcompile%2Fctf-types%2Fust_tests_ctf_types.h;h=489f04a204d05146059477f6a6187eee7357afe7;hb=78684808fe09e0a094a75042e4f4383b2346bce6;hp=def0293a71d13ae0b4a8ec79a6609136d2c139da;hpb=c2c72ddee62023174ab8c130c0b51800a8fb01e9;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 def0293a..489f04a2 100644
--- a/tests/compile/ctf-types/ust_tests_ctf_types.h
+++ b/tests/compile/ctf-types/ust_tests_ctf_types.h
@@ -4,8 +4,8 @@
  * 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(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_CTF_TYPES_H
@@ -13,19 +13,19 @@
 #include <lttng/tracepoint.h>
 
 LTTNG_UST_TRACEPOINT_ENUM(ust_tests_ctf_types, testenum,
-	TP_ENUM_VALUES(
-		ctf_enum_value("even", 0)
-		ctf_enum_value("uneven", 1)
-		ctf_enum_range("twoto4", 2, 4)
-		ctf_enum_value("five\"extra\\test", 5)
+	LTTNG_UST_TP_ENUM_VALUES(
+		lttng_ust_field_enum_value("even", 0)
+		lttng_ust_field_enum_value("uneven", 1)
+		lttng_ust_field_enum_range("twoto4", 2, 4)
+		lttng_ust_field_enum_value("five\"extra\\test", 5)
 	)
 )
 
 LTTNG_UST_TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
-	TP_ENUM_VALUES(
-		ctf_enum_value("zero", 0)
-		ctf_enum_value("five", 5)
-		ctf_enum_range("ten_to_twenty", 10, 20)
+	LTTNG_UST_TP_ENUM_VALUES(
+		lttng_ust_field_enum_value("zero", 0)
+		lttng_ust_field_enum_value("five", 5)
+		lttng_ust_field_enum_range("ten_to_twenty", 10, 20)
 	)
 )
 
@@ -36,11 +36,11 @@ LTTNG_UST_TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
 LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
 	LTTNG_UST_TP_ARGS(int, anint, int, enumval, int, enumval2),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer(int, intfield, anint)
-		ctf_enum(ust_tests_ctf_types, testenum, int, enumfield, enumval)
-		ctf_enum(ust_tests_ctf_types, testenum, long long,
+		lttng_ust_field_integer(int, intfield, anint)
+		lttng_ust_field_enum(ust_tests_ctf_types, testenum, int, enumfield, enumval)
+		lttng_ust_field_enum(ust_tests_ctf_types, testenum, long long,
 				enumfield_bis, enumval)
-		ctf_enum(ust_tests_ctf_types, testenum2, unsigned int,
+		lttng_ust_field_enum(ust_tests_ctf_types, testenum2, unsigned int,
 				enumfield_third, enumval2)
 	)
 )
@@ -52,16 +52,16 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
 LTTNG_UST_TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis,
 	LTTNG_UST_TP_ARGS(int, anint, int, enumval),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer(int, intfield, anint)
-		ctf_enum(ust_tests_ctf_types, testenum, unsigned char,
+		lttng_ust_field_integer(int, intfield, anint)
+		lttng_ust_field_enum(ust_tests_ctf_types, testenum, unsigned char,
 			enumfield, enumval)
 	)
 )
 
 #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>