From e3917fc5389f2dc7f9581910d931f18436f6c3fb Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Thu, 1 Nov 2007 14:53:32 -0700
Subject: [PATCH] Move declarations before statements

C99 permits declarations and statements to be intermixed, so gcc don't
warn about them, but MSVC and OpenWatcom get unhappy about them.
---
 assemble.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/assemble.c b/assemble.c
index 9ef91732..e82d3b90 100644
--- a/assemble.c
+++ b/assemble.c
@@ -788,9 +788,10 @@ static int32_t calcsize(int32_t segment, int32_t offset, int bits,
     int32_t length = 0;
     uint8_t c;
     int rex_mask = ~0;
-    ins->rex = 0;               /* Ensure REX is reset */
     struct operand *opx;
 
+    ins->rex = 0;               /* Ensure REX is reset */
+
     if (ins->prefixes[PPS_OSIZE] == P_O64)
 	ins->rex |= REX_W;
 
-- 
2.11.4.GIT