X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=include%2Flttng%2Fust-tracepoint-event-reset.h;h=10c288fe576699fa85eb3fa176217ebbf74094a4;hb=7075c5a2f8f4f90a018d7d1ea8c6dadda609495d;hp=3262e0b0738f9606bb94a22c3171a521ce886777;hpb=3202f63a4d5e599bf22d6711828614b58c7efcba;p=lttng-ust.git

diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h
index 3262e0b0..10c288fe 100644
--- a/include/lttng/ust-tracepoint-event-reset.h
+++ b/include/lttng/ust-tracepoint-event-reset.h
@@ -10,7 +10,7 @@
 #define LTTNG_UST__TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)
 
 #undef LTTNG_UST__TRACEPOINT_EVENT_INSTANCE
-#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_provider, _template, _name, _args)
+#define LTTNG_UST__TRACEPOINT_EVENT_INSTANCE(_template_provider, _template_name, _provider, _name, _args)
 
 #undef LTTNG_UST_TRACEPOINT_ENUM
 #define LTTNG_UST_TRACEPOINT_ENUM(_provider, _name, _values)
@@ -45,11 +45,11 @@
 #undef lttng_ust__field_string
 #define lttng_ust__field_string(_item, _src, _nowrite)
 
-#undef _ctf_unused
-#define _ctf_unused(_src)
+#undef lttng_ust__field_unused
+#define lttng_ust__field_unused(_src)
 
-#undef _ctf_enum
-#define _ctf_enum(_provider, _name, _type, _item, _src, _nowrite)
+#undef lttng_ust__field_enum
+#define lttng_ust__field_enum(_provider, _name, _type, _item, _src, _nowrite)
 
 /* "write" */
 #undef lttng_ust_field_integer
@@ -100,11 +100,11 @@
 #undef lttng_ust_field_string
 #define lttng_ust_field_string(_item, _src)
 
-#undef ctf_unused
-#define ctf_unused(_src)
+#undef lttng_ust_field_unused
+#define lttng_ust_field_unused(_src)
 
-#undef ctf_enum
-#define ctf_enum(_provider, _name, _type, _item, _src)
+#undef lttng_ust_field_enum
+#define lttng_ust_field_enum(_provider, _name, _type, _item, _src)
 
 /* "nowrite" */
 #undef lttng_ust_field_integer_nowrite
@@ -146,8 +146,8 @@
 #undef lttng_ust_field_string_nowrite
 #define lttng_ust_field_string_nowrite(_item, _src)
 
-#undef ctf_unused_nowrite
-#define ctf_unused_nowrite(_src)
+#undef lttng_ust_field_unused_nowrite
+#define lttng_ust_field_unused_nowrite(_src)
 
-#undef ctf_enum_nowrite
-#define ctf_enum_nowrite(_provider, _name, _type, _item, _src)
+#undef lttng_ust_field_enum_nowrite
+#define lttng_ust_field_enum_nowrite(_provider, _name, _type, _item, _src)