../../include/lttng/ust-tracepoint-event.h:328:23: warning: ISO C does not permit named variadic macros [-Wvariadic-macros]
Use ... and __VA_ARGS__ instead of args... and args.
This enables ISO-C compability for the tracepoint headers for program
instrumentation. Note that the probes need to be built _without_ strict
C99 flags (they require gnu extensions).
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
-#define TP_FIELDS(args...) args /* Only one used in this phase */
+#define TP_FIELDS(...) __VA_ARGS__ /* Only one used in this phase */
#undef TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#undef TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#include <lttng/ust-tracepoint-event-reset.h>
#undef TP_ARGS
#include <lttng/ust-tracepoint-event-reset.h>
#undef TP_ARGS
-#define TP_ARGS(args...) args
+#define TP_ARGS(...) __VA_ARGS__
#undef TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#undef TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
__event_len += __dynamic_len[__dynamic_len_idx++] = strlen(_src) + 1;
#undef TP_ARGS
__event_len += __dynamic_len[__dynamic_len_idx++] = strlen(_src) + 1;
#undef TP_ARGS
-#define TP_ARGS(args...) args
+#define TP_ARGS(...) __VA_ARGS__
-#define TP_FIELDS(args...) args
+#define TP_FIELDS(...) __VA_ARGS__
#undef TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#undef TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#define ctf_string(_item, _src)
#undef TP_ARGS
#define ctf_string(_item, _src)
#undef TP_ARGS
-#define TP_ARGS(args...) args
+#define TP_ARGS(...) __VA_ARGS__
-#define TP_FIELDS(args...) args
+#define TP_FIELDS(...) __VA_ARGS__
#undef TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#undef TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#define __get_dynamic_len(field) __dynamic_len[__dynamic_len_idx++]
#undef TP_ARGS
#define __get_dynamic_len(field) __dynamic_len[__dynamic_len_idx++]
#undef TP_ARGS
-#define TP_ARGS(args...) args
+#define TP_ARGS(...) __VA_ARGS__
-#define TP_FIELDS(args...) args
+#define TP_FIELDS(...) __VA_ARGS__
#undef TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#undef TRACEPOINT_EVENT_CLASS
#define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields) \
#include <lttng/ust-tracepoint-event-reset.h>
#undef TP_ARGS
#include <lttng/ust-tracepoint-event-reset.h>
#undef TP_ARGS
-#define TP_ARGS(args...) args
+#define TP_ARGS(...) __VA_ARGS__
#define _TP_EXTRACT_STRING2(...) #__VA_ARGS__
#define _TP_EXTRACT_STRING2(...) #__VA_ARGS__