#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_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_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)