X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=tests%2Fcompile%2Fctf-types%2Fust_tests_ctf_types.h;h=3721045c2a542ade3aa9565e9825ea5d96d73fb7;hb=4849bc7a9e250ce47d7a3deb0d2327cc4b50422f;hp=e789cbe0bcc5b62a77d2f1557abcc9aff5c0e290;hpb=dbe6ade0ba17270b2cb119b9961bbb7e48ce4733;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 e789cbe0..3721045c 100644
--- a/tests/compile/ctf-types/ust_tests_ctf_types.h
+++ b/tests/compile/ctf-types/ust_tests_ctf_types.h
@@ -1,35 +1,19 @@
-#undef TRACEPOINT_PROVIDER
-#define TRACEPOINT_PROVIDER ust_tests_ctf_types
-
-#if !defined(_TRACEPOINT_UST_TESTS_CTF_TYPES_H) || defined(TRACEPOINT_HEADER_MULTI_READ)
-#define _TRACEPOINT_UST_TESTS_CTF_TYPES_H
-
 /*
- * Copyright (C) 2014 Geneviève Bastien <gbastien@versatic.net>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * SPDX-License-Identifier: MIT
  *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright (C) 2014 Geneviève Bastien <gbastien@versatic.net>
  */
 
+#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
+
 #include <lttng/tracepoint.h>
 
-TRACEPOINT_ENUM(ust_tests_ctf_types, testenum,
-	TP_ENUM_VALUES(
+LTTNG_UST_TRACEPOINT_ENUM(ust_tests_ctf_types, testenum,
+	LTTNG_UST_TP_ENUM_VALUES(
 		ctf_enum_value("even", 0)
 		ctf_enum_value("uneven", 1)
 		ctf_enum_range("twoto4", 2, 4)
@@ -37,8 +21,8 @@ TRACEPOINT_ENUM(ust_tests_ctf_types, testenum,
 	)
 )
 
-TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
-	TP_ENUM_VALUES(
+LTTNG_UST_TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
+	LTTNG_UST_TP_ENUM_VALUES(
 		ctf_enum_value("zero", 0)
 		ctf_enum_value("five", 5)
 		ctf_enum_range("ten_to_twenty", 10, 20)
@@ -49,9 +33,9 @@ TRACEPOINT_ENUM(ust_tests_ctf_types, testenum2,
  * Enumeration field is used twice to make sure the type declaration
  * is entered only once in the metadata file.
  */
-TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
-	TP_ARGS(int, anint, int, enumval, int, enumval2),
-	TP_FIELDS(
+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,
@@ -65,9 +49,9 @@ TRACEPOINT_EVENT(ust_tests_ctf_types, tptest,
  * Another tracepoint using the types to make sure each type is entered
  * only once in the metadata file.
  */
-TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis,
-	TP_ARGS(int, anint, int, enumval),
-	TP_FIELDS(
+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,
 			enumfield, enumval)
@@ -76,8 +60,8 @@ TRACEPOINT_EVENT(ust_tests_ctf_types, tptest_bis,
 
 #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>