X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fcompile%2Fhello.cxx%2Fust_tests_hello.h;h=4bcbce9a70bde6cb081f5ef86e26d0a93a5896f8;hb=10937ee5c85456292ce4e8d67c9ac7bc37caf974;hp=308d024ff738268206a3a830d51d7b8a8b60d9f3;hpb=c2c72ddee62023174ab8c130c0b51800a8fb01e9;p=lttng-ust.git

diff --git a/tests/compile/hello.cxx/ust_tests_hello.h b/tests/compile/hello.cxx/ust_tests_hello.h
index 308d024f..4bcbce9a 100644
--- a/tests/compile/hello.cxx/ust_tests_hello.h
+++ b/tests/compile/hello.cxx/ust_tests_hello.h
@@ -4,8 +4,8 @@
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  */
 
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER ust_tests_hello
+#undef LTTNG_UST_TRACEPOINT_PROVIDER
+#define LTTNG_UST_TRACEPOINT_PROVIDER ust_tests_hello
 
 #if !defined(_TRACEPOINT_UST_TESTS_HELLO_H) || defined(LTTNG_UST_TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_HELLO_H
@@ -14,7 +14,7 @@
 #include <stddef.h>
 
 LTTNG_UST_TRACEPOINT_ENUM(ust_tests_hello, my_enum,
-	TP_ENUM_VALUES(
+	LTTNG_UST_TP_ENUM_VALUES(
 		ctf_enum_value("zero", 0)
 		ctf_enum_value("one", 1)
 		ctf_enum_auto("two")
@@ -30,20 +30,20 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest,
 		 double, doublearg, float, floatarg,
 		 int, enumarg),
 	LTTNG_UST_TP_FIELDS(
-		ctf_integer(int, intfield, anint)
-		ctf_integer_hex(int, intfield2, anint)
-		ctf_integer(long, longfield, anint)
-		ctf_integer_network(int, netintfield, netint)
-		ctf_integer_network_hex(int, netintfieldhex, netint)
-		ctf_array(long, arrfield1, values, 3)
-		ctf_array_text(char, arrfield2, text, 10)
+		lttng_ust_field_integer(int, intfield, anint)
+		lttng_ust_field_integer_hex(int, intfield2, anint)
+		lttng_ust_field_integer(long, longfield, anint)
+		lttng_ust_field_integer_network(int, netintfield, netint)
+		lttng_ust_field_integer_network_hex(int, netintfieldhex, netint)
+		lttng_ust_field_array(long, arrfield1, values, 3)
+		lttng_ust_field_array_text(char, arrfield2, text, 10)
 		ctf_sequence(char, seqfield1, text,
 			     size_t, textlen)
 		ctf_sequence_text(char, seqfield2, text,
 			     size_t, textlen)
 		ctf_string(stringfield, text)
-		ctf_float(float, floatfield, floatarg)
-		ctf_float(double, doublefield, doublearg)
+		lttng_ust_field_float(float, floatfield, floatarg)
+		lttng_ust_field_float(double, doublefield, doublearg)
 		ctf_enum(ust_tests_hello, my_enum, int, enumfield, enumarg)
 	)
 )
@@ -55,8 +55,8 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest_sighandler,
 
 #endif /* _TRACEPOINT_UST_TESTS_HELLO_H */
 
-#undef TRACEPOINT_INCLUDE
-#define TRACEPOINT_INCLUDE "./ust_tests_hello.h"
+#undef LTTNG_UST_TRACEPOINT_INCLUDE
+#define LTTNG_UST_TRACEPOINT_INCLUDE "./ust_tests_hello.h"
 
 /* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>