Tracepoint API namespacing ctf_integer

[lttng-ust.git] / tests / compile / hello / ust_tests_hello.h

diff --git a/tests/compile/hello/ust_tests_hello.h b/tests/compile/hello/ust_tests_hello.h
index 5c2415cdbc6172589def50000ba7256f4b3f5cdd..2ef4ca4ffdcdd2a76a48e6e8afbdeba285e9c452 100644 (file)
--- a/tests/compile/hello/ust_tests_hello.h
+++ b/tests/compile/hello/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
@@ -20,11 +20,11 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest,
                double, doublearg, float, floatarg,
                bool, boolarg),
        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)
+               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)
                ctf_array_nowrite(long, arrfield1z, values, 3)
                ctf_array(long, blah, values, 3)
                ctf_array(long, arrfield1, values, 3)
@@ -45,8 +45,8 @@ LTTNG_UST_TRACEPOINT_EVENT(ust_tests_hello, tptest,
                ctf_string(stringfield, text)
                ctf_float(float, floatfield, floatarg)
                ctf_float(double, doublefield, doublearg)
-               ctf_integer(bool, boolfield, boolarg)
-               ctf_integer_nowrite(int, filterfield, anint)
+               lttng_ust_field_integer(bool, boolfield, boolarg)
+               lttng_ust_field_integer_nowrite(int, filterfield, anint)
        )
 )
 
@@ -57,8 +57,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>