Fix tracepoint event related build errors

[lttng-ust.git] / tests / fork / ust_tests_fork.h

diff --git a/tests/fork/ust_tests_fork.h b/tests/fork/ust_tests_fork.h
index 4bd105bddd790b93aafdb6e0d5b176a80fe072b5..3d7eb342c63c1cc91919aa3742daeec8c031a5f4 100644 (file)
--- a/tests/fork/ust_tests_fork.h
+++ b/tests/fork/ust_tests_fork.h
@@ -1,5 +1,5 @@
-#undef TRACEPOINT_SYSTEM
-#define TRACEPOINT_SYSTEM ust_tests_fork
+#undef TRACEPOINT_PROVIDER
+#define TRACEPOINT_PROVIDER ust_tests_fork
 
 #if !defined(_TRACEPOINT_UST_TESTS_FORK_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
 #define _TRACEPOINT_UST_TESTS_FORK_H
@@ -7,50 +7,45 @@
 /*
  * Copyright (C) 2011  Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; version 2.1 of
- * the License.
+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+ * Permission is hereby granted to use or copy this program
+ * for any purpose,  provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
  */
 
 #include <lttng/tracepoint.h>
 #include <sys/types.h>
 
-TRACEPOINT_EVENT_NOARGS(ust_tests_fork, before_fork,
+TRACEPOINT_EVENT(ust_tests_fork, before_fork,
+       TP_ARGS(),
        TP_FIELDS()
 )
 
 TRACEPOINT_EVENT(ust_tests_fork, after_fork_child,
-       TP_PROTO(pid_t pid),
-       TP_ARGS(pid),
+       TP_ARGS(pid_t, pid),
        TP_FIELDS(
                ctf_integer(pid_t, pid, pid)
        )
 )
 
-TRACEPOINT_EVENT_NOARGS(ust_tests_fork, after_fork_parent,
+TRACEPOINT_EVENT(ust_tests_fork, after_fork_parent,
+       TP_ARGS(),
        TP_FIELDS()
 )
 
-TRACEPOINT_EVENT_NOARGS(ust_tests_fork, after_exec,
+TRACEPOINT_EVENT(ust_tests_fork, after_exec,
+       TP_ARGS(),
        TP_FIELDS()
 )
 
 #endif /* _TRACEPOINT_UST_TESTS_FORK_H */
 
-#undef TRACEPOINT_INCLUDE_PATH
-#define TRACEPOINT_INCLUDE_PATH .
 #undef TRACEPOINT_INCLUDE_FILE
-#define TRACEPOINT_INCLUDE_FILE ust_tests_fork
+#define TRACEPOINT_INCLUDE_FILE ./ust_tests_fork.h
 
-/* This part must be outside protection */
+/* This part must be outside ifdef protection */
 #include <lttng/tracepoint-event.h>