X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=include%2Flttng%2Fust-tracepoint-event-reset.h;h=10c288fe576699fa85eb3fa176217ebbf74094a4;hb=5b675300cd432c3dff378ac5b78eb6b56d4294e6;hp=9a7ed708f98fb94538223a992cb05c37981e3be7;hpb=1d188af9688feee0ec4e34038113a0edccddd4ea;p=lttng-ust.git

diff --git a/include/lttng/ust-tracepoint-event-reset.h b/include/lttng/ust-tracepoint-event-reset.h
index 9a7ed708..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)
@@ -42,14 +42,14 @@
 #define lttng_ust__field_sequence_encoded(_type, _item, _src, _byte_order, _length_type, \
 			_src_length, _encoding, _nowrite, _elem_type_base)
 
-#undef _ctf_string
-#define _ctf_string(_item, _src, _nowrite)
+#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
@@ -97,14 +97,14 @@
 #undef lttng_ust_field_sequence_text
 #define lttng_ust_field_sequence_text(_type, _item, _src, _length_type, _src_length)
 
-#undef ctf_string
-#define ctf_string(_item, _src)
+#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
@@ -143,11 +143,11 @@
 #undef lttng_ust_field_sequence_text_nowrite
 #define lttng_ust_field_sequence_text_nowrite(_type, _item, _src, _length_type, _src_length)
 
-#undef ctf_string_nowrite
-#define ctf_string_nowrite(_item, _src)
+#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)