Rename LTTNG_TP_EXTERN_C to LTTNG_UST_TP_EXTERN_C

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

diff --git a/include/lttng/tracepoint.h b/include/lttng/tracepoint.h
index 02d2cf13367ab2768a65886ffebb4d9f2d568a2b..49db615a0996e49b067534e388baaa360a820292 100644 (file)
--- a/include/lttng/tracepoint.h
+++ b/include/lttng/tracepoint.h
@@ -185,9 +185,10 @@ void __tracepoint_cb_##_provider##___##_name(_TP_ARGS_PROTO(__VA_ARGS__))          \
 end:                                                                                   \
        tp_rcu_read_unlock();                                                           \
 }                                                                                      \
-static inline lttng_ust_notrace                                                                \
+static inline                                                                          \
 void __tracepoint_register_##_provider##___##_name(char *name,                         \
-               void (*func)(void), void *data);                                        \
+               void (*func)(void), void *data)                                         \
+       lttng_ust_notrace;                                                              \
 static inline                                                                          \
 void __tracepoint_register_##_provider##___##_name(char *name,                         \
                void (*func)(void), void *data)                                         \
@@ -195,9 +196,10 @@ void __tracepoint_register_##_provider##___##_name(char *name,                             \
        __tracepoint_probe_register(name, func, data,                                   \
                __tracepoint_##_provider##___##_name.signature);                        \
 }                                                                                      \
-static inline lttng_ust_notrace                                                                \
+static inline                                                                          \
 void __tracepoint_unregister_##_provider##___##_name(char *name,                       \
-               void (*func)(void), void *data);                                        \
+               void (*func)(void), void *data)                                         \
+       lttng_ust_notrace;                                                              \
 static inline                                                                          \
 void __tracepoint_unregister_##_provider##___##_name(char *name,                       \
                void (*func)(void), void *data)                                         \
@@ -310,8 +312,9 @@ static inline void tracepoint_disable_destructors(void)
 }
 
 #ifndef _LGPL_SOURCE
-static inline void lttng_ust_notrace
-__tracepoint__init_urcu_sym(void);
+static inline void
+__tracepoint__init_urcu_sym(void)
+       lttng_ust_notrace;
 static inline void
 __tracepoint__init_urcu_sym(void)
 {
@@ -338,16 +341,18 @@ __tracepoint__init_urcu_sym(void)
                                        "tp_rcu_dereference_sym"));
 }
 #else
-static inline void lttng_ust_notrace
-__tracepoint__init_urcu_sym(void);
+static inline void
+__tracepoint__init_urcu_sym(void)
+       lttng_ust_notrace;
 static inline void
 __tracepoint__init_urcu_sym(void)
 {
 }
 #endif
 
-static void lttng_ust_notrace __attribute__((constructor))
-__tracepoints__init(void);
+static void
+__tracepoints__init(void)
+       lttng_ust_notrace __attribute__((constructor));
 static void
 __tracepoints__init(void)
 {
@@ -368,8 +373,9 @@ __tracepoints__init(void)
        __tracepoint__init_urcu_sym();
 }
 
-static void lttng_ust_notrace __attribute__((destructor))
-__tracepoints__destroy(void);
+static void
+__tracepoints__destroy(void)
+       lttng_ust_notrace __attribute__((destructor));
 static void
 __tracepoints__destroy(void)
 {
@@ -459,8 +465,9 @@ extern struct lttng_ust_tracepoint * const __stop___tracepoints_ptrs[]
                __lttng_ust_variable_attribute_no_sanitize_address =            \
                        &__tracepoint_##_provider##___##_name;
 
-static void lttng_ust_notrace __attribute__((constructor))
-__tracepoints__ptrs_init(void);
+static void
+__tracepoints__ptrs_init(void)
+       lttng_ust_notrace __attribute__((constructor));
 static void
 __tracepoints__ptrs_init(void)
 {
@@ -499,8 +506,9 @@ __tracepoints__ptrs_init(void)
        }
 }
 
-static void lttng_ust_notrace __attribute__((destructor))
-__tracepoints__ptrs_destroy(void);
+static void
+__tracepoints__ptrs_destroy(void)
+       lttng_ust_notrace __attribute__((destructor));
 static void
 __tracepoints__ptrs_destroy(void)
 {