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

This reverts commit a4eaf8eabe829be8f7d7432ffaf83291a068b0ed.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

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
 

diff --git a/tests/hello/Makefile.am b/tests/hello/Makefile.am
index 4abfd580a47226e9c8c60d527ef553ff1e826dcb..0c4c3113bcdcaa6d8a7154e44f550b9e8e5fb40a 100644 (file)
--- a/tests/hello/Makefile.am
+++ b/tests/hello/Makefile.am
@@ -1,10 +1,9 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include -Wsystem-headers
 
 noinst_PROGRAMS = hello
-#hello_SOURCES = hello.c tp.c ust_tests_hello.h
-hello_SOURCES = hello.c ust_tests_hello.h
+hello_SOURCES = hello.c tp.c ust_tests_hello.h
 hello_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la
-hello_CFLAGS = -Werror=old-style-definition --std=c99 -pedantic
+hello_CFLAGS = -Werror=old-style-definition
 
 if LTTNG_UST_BUILD_WITH_LIBDL
 hello_LDADD += -ldl