Merge branch 'master' of git.lttng.org:/home/git/lttng-ust

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

diff --git a/tests/hello/ust_tests_hello.h b/tests/hello/ust_tests_hello.h
index 9e5043ddc6902760b931883894bcaf05bd893df3..9f38e983a90a054de2bb9e16aebd03f0ca04cfee 100644 (file)
--- a/tests/hello/ust_tests_hello.h
+++ b/tests/hello/ust_tests_hello.h
@@ -26,13 +26,13 @@ extern "C" {
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <ust/tracepoint.h>
+#include <lttng/tracepoint.h>
 
-TRACEPOINT_EVENT(ust_tests_hello_tptest,
+TRACEPOINT_EVENT(ust_tests_hello, tptest,
        TP_PROTO(int anint, int netint, long *values,
                 char *text, size_t textlen,
                 double doublearg, float floatarg),
-       TP_ARGS(anint, netint, values, text, textlen,
+       TP_VARS(anint, netint, values, text, textlen,
                doublearg, floatarg),
        TP_FIELDS(
                ctf_integer(int, intfield, anint)
@@ -52,7 +52,7 @@ TRACEPOINT_EVENT(ust_tests_hello_tptest,
        )
 )
 
-TRACEPOINT_EVENT_NOARGS(ust_tests_hello_tptest_sighandler,
+TRACEPOINT_EVENT_NOARGS(ust_tests_hello, tptest_sighandler,
        TP_FIELDS()
 )
 
@@ -64,7 +64,7 @@ TRACEPOINT_EVENT_NOARGS(ust_tests_hello_tptest_sighandler,
 #define TRACEPOINT_INCLUDE_FILE ust_tests_hello
 
 /* This part must be outside protection */
-#include <ust/tracepoint-event.h>
+#include <lttng/tracepoint-event.h>
 
 #ifdef __cplusplus 
 }