From: Mathieu Desnoyers Date: Tue, 15 Mar 2016 15:01:32 +0000 (-0400) Subject: Use system include paths in lttng-tracepoint-event-impl.h X-Git-Tag: v2.8.0-rc1~14 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=ba012e22f899425f71dcd4482cc8ff3654aca483;p=lttng-modules.git Use system include paths in lttng-tracepoint-event-impl.h Signed-off-by: Mathieu Desnoyers --- diff --git a/probes/lttng-tracepoint-event-impl.h b/probes/lttng-tracepoint-event-impl.h index 91de803a..f774dff5 100644 --- a/probes/lttng-tracepoint-event-impl.h +++ b/probes/lttng-tracepoint-event-impl.h @@ -125,7 +125,7 @@ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include "lttng-events-reset.h" +#include #undef TP_PROTO #define TP_PROTO(...) __VA_ARGS__ @@ -151,7 +151,7 @@ void trace_##_name(void); * class and the instance using the class actually match. */ -#include "lttng-events-reset.h" /* Reset all macros within TRACE_EVENT */ +#include /* Reset all macros within TRACE_EVENT */ #undef TP_PROTO #define TP_PROTO(...) __VA_ARGS__ @@ -185,9 +185,9 @@ void __event_template_proto___##_name(void); */ /* Reset all macros within TRACEPOINT_EVENT */ -#include "lttng-events-reset.h" -#include "lttng-events-write.h" -#include "lttng-events-nowrite.h" +#include +#include +#include #undef _ctf_integer_ext #define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _user, _nowrite) \ @@ -323,7 +323,7 @@ void __event_template_proto___##_name(void); */ /* Reset all macros within TRACEPOINT_EVENT */ -#include "lttng-events-reset.h" +#include #undef TP_PROTO #define TP_PROTO(...) __VA_ARGS__ @@ -345,8 +345,8 @@ static void __event_probe__##_name(void *__data); */ /* Reset all macros within TRACEPOINT_EVENT */ -#include "lttng-events-reset.h" -#include "lttng-events-write.h" +#include +#include #undef _ctf_integer_ext #define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _user, _nowrite) \ @@ -438,9 +438,9 @@ static inline size_t __event_get_size__##_name(size_t *__dynamic_len, \ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include "lttng-events-reset.h" -#include "lttng-events-write.h" -#include "lttng-events-nowrite.h" +#include +#include +#include #undef _ctf_integer_ext_fetched #define _ctf_integer_ext_fetched(_type, _item, _src, _byte_order, _base, _nowrite) \ @@ -608,8 +608,8 @@ void __event_prepare_filter_stack__##_name(char *__stack_data, \ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include "lttng-events-reset.h" -#include "lttng-events-write.h" +#include +#include #undef _ctf_integer_ext #define _ctf_integer_ext(_type, _item, _src, _byte_order, _base, _user, _nowrite) \ @@ -680,8 +680,8 @@ static inline size_t __event_get_align__##_name(void *__tp_locvar) \ */ /* Reset all macros within TRACEPOINT_EVENT */ -#include "lttng-events-reset.h" -#include "lttng-events-write.h" +#include +#include #undef _ctf_integer_ext_fetched #define _ctf_integer_ext_fetched(_type, _item, _src, _byte_order, _base, _nowrite) \ @@ -1041,7 +1041,7 @@ __post: \ /* Named field types must be defined in lttng-types.h */ -#include "lttng-events-reset.h" /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ +#include /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ #ifndef TP_PROBE_CB #define TP_PROBE_CB(_template) &__event_probe__##_template @@ -1070,7 +1070,7 @@ static const struct lttng_event_desc __event_desc___##_map = { \ * Create an array of event description pointers. */ -#include "lttng-events-reset.h" /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ +#include /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ #undef LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS #define LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP_NOARGS(_template, _name, _map) \ @@ -1118,7 +1118,7 @@ static __used struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { * Register/unregister probes at module load/unload. */ -#include "lttng-events-reset.h" /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ +#include /* Reset all macros within LTTNG_TRACEPOINT_EVENT */ #define TP_ID1(_token, _system) _token##_system #define TP_ID(_token, _system) TP_ID1(_token, _system)