From f059e76172127338e3f29fcc0223220114df77e7 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Mon, 18 Jun 2012 10:21:44 -0400 Subject: [PATCH] Revert "Fix c99 compatibility: tp_rcu_dereference_bp() should not use braced-groups within expressions" This reverts commit a4eaf8eabe829be8f7d7432ffaf83291a068b0ed. Signed-off-by: Mathieu Desnoyers --- include/lttng/tracepoint-rcu.h | 9 ++++++--- tests/hello/Makefile.am | 5 ++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/lttng/tracepoint-rcu.h b/include/lttng/tracepoint-rcu.h index 2e0a79fd..a754048c 100644 --- 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 4abfd580..0c4c3113 100644 --- 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 -- 2.34.1