From 8e5247203720de7abd084996c00afd6fb6f6cc21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Mart=C3=ADn=20Nieto?= Date: Thu, 6 Mar 2014 16:40:34 +0100 Subject: tests: MSVC compat MSVC doesn't like declaring variables in the middle of a block, so make sure we only declare variables at the beginning of a block. --- tests/structinit/structinit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/structinit/structinit.c b/tests/structinit/structinit.c index db7ee07fa..ce425be41 100644 --- a/tests/structinit/structinit.c +++ b/tests/structinit/structinit.c @@ -19,8 +19,10 @@ * signature "int (structname* instance, int version)". */ #define CHECK_MACRO_FUNC_INIT_EQUAL(structname, structver, macroinit, funcinitname) \ +do { \ structname structname##_macro_latest = macroinit; \ structname structname##_func_latest; \ + int structname##_curr_ver = structver - 1; \ cl_git_pass(funcinitname(&structname##_func_latest, structver)); \ cl_check_( \ memcmp(&structname##_macro_latest, &structname##_func_latest, \ @@ -28,13 +30,13 @@ "Macro-based and function-based initializer for " STRINGIFY(structname) \ " are not equivalent."); \ \ - int structname##_curr_ver = structver - 1; \ while (structname##_curr_ver > 0) \ { \ structname macro; \ cl_git_pass(funcinitname(¯o, structname##_curr_ver)); \ structname##_curr_ver--; \ - } + }\ +} while(0) void test_structinit_structinit__compare(void) { -- cgit v1.2.1