From 1f9191f6efa5f2e0284c194f920093201b27ef81 Mon Sep 17 00:00:00 2001 From: Jon Loeliger Date: Tue, 31 Jan 2017 15:27:19 -0600 Subject: Localize the timeout variable within the W message macro. Rather than rely on an unbound variable, explicitly introduce the timeout variable within the 'do { ... } while (0)' construct as a block-local variable. Change-Id: I6e78635290f9b5ab3f56b7f116c5fa762c88c9e9 Signed-off-by: Jon Loeliger --- src/vlibapi/vat_helper_macros.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/vlibapi/vat_helper_macros.h') diff --git a/src/vlibapi/vat_helper_macros.h b/src/vlibapi/vat_helper_macros.h index 172fe2db..ffb74fe3 100644 --- a/src/vlibapi/vat_helper_macros.h +++ b/src/vlibapi/vat_helper_macros.h @@ -44,7 +44,7 @@ do { \ /* W: wait for results, with timeout */ #define W \ do { \ - timeout = vat_time_now (vam) + 1.0; \ + f64 timeout = vat_time_now (vam) + 1.0; \ \ while (vat_time_now (vam) < timeout) { \ if (vam->result_ready == 1) { \ @@ -58,7 +58,7 @@ do { \ /* W2: wait for results, with timeout */ #define W2(body) \ do { \ - timeout = vat_time_now (vam) + 1.0; \ + f64 timeout = vat_time_now (vam) + 1.0; \ \ while (vat_time_now (vam) < timeout) { \ if (vam->result_ready == 1) { \ -- cgit 1.2.3-korg