Revert "Fix c99 compatibility: tp_rcu_dereference_bp() should not use braced-groups...

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

diff --git a/include/lttng/tracepoint-rcu.h b/include/lttng/tracepoint-rcu.h
index 2e0a79fd02d6cf88363252393a4f13011eedfb78..a754048cc51ccc624a028c522aa8a030fbf04fcf 100644 (file)
--- a/include/lttng/tracepoint-rcu.h
+++ b/include/lttng/tracepoint-rcu.h
@@ -31,9 +31,12 @@
 #define tp_rcu_read_lock_bp    tracepoint_dlopen.rcu_read_lock_sym_bp
 #define tp_rcu_read_unlock_bp  tracepoint_dlopen.rcu_read_unlock_sym_bp
 
-#define tp_rcu_dereference_bp(p)                                          \
-               URCU_FORCE_CAST(__typeof__(p),                             \
-                       tracepoint_dlopen.rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, p)))
+#define tp_rcu_dereference_bp(p)                                            \
+       ({                                                                   \
+               __typeof__(p) _________p1 = URCU_FORCE_CAST(__typeof__(p),   \
+                       tracepoint_dlopen.rcu_dereference_sym_bp(URCU_FORCE_CAST(void *, p))); \
+               (_________p1);                                               \
+       })
 
 #define TP_RCU_LINK_TEST()     tp_rcu_read_lock_bp