Fix: perform macro expansion on tracepoint signatures

[lttng-ust.git] / include / lttng / ust-tracepoint-event.h

diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index 520f8c061e02c041b07ad54979eb12b0db51a3a5..c2e951928ce99bab360dfa7a52f813993e90b46f 100644 (file)
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -444,15 +444,19 @@ static void __event_probe__##_provider##___##_name(_TP_ARGS_DATA_PROTO(_args))\
 #include <lttng/ust-tracepoint-event-reset.h>
 
 #undef TP_ARGS
-#define TP_ARGS(args...) #args
+#define TP_ARGS(args...) args
+
+#define _TP_EXTRACT_STRING2(...)       #__VA_ARGS__
 
 #undef TRACEPOINT_EVENT_CLASS
 #define TRACEPOINT_EVENT_CLASS(_provider, _name, _args, _fields)       \
 const char __tp_event_signature___##_provider##___##_name[] =          \
-               _args;
+               _TP_EXTRACT_STRING2(_args);
 
 #include TRACEPOINT_INCLUDE
 
+#undef _TP_EXTRACT_STRING2
+
 /*
  * Stage 6 of tracepoint event generation.
  *