From 82db53ca1ab1f3b90e7c57917698e3c6f4862b5d Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Thu, 30 Jul 2015 00:55:35 +0200
Subject: [PATCH] Expat compilation fix for pre-C99 compilers.

Don't mix statements and declarations, this is not allowed in C89.

Fixes compilation with MSVC <= 10 after 74da7cba072df4c8933532812b468da571358b23

See #17083.

(this is a backport of 9b029ea88ad0ee910644135523409d60c8183988 from master)
---
 src/expat/lib/xmlparse.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/expat/lib/xmlparse.c b/src/expat/lib/xmlparse.c
index e3d77a5a26..4dd2cf989a 100644
--- a/src/expat/lib/xmlparse.c
+++ b/src/expat/lib/xmlparse.c
@@ -1703,14 +1703,15 @@ XML_GetBuffer(XML_Parser parser, int len)
   }
 
   if (len > bufferLim - bufferEnd) {
+#ifdef XML_CONTEXT_BYTES
+    int keep = (int)(bufferPtr - buffer);
+#endif /* defined XML_CONTEXT_BYTES */
     int neededSize = len + (int)(bufferEnd - bufferPtr);
     if (neededSize < 0) {
       errorCode = XML_ERROR_NO_MEMORY;
       return NULL;
     }
 #ifdef XML_CONTEXT_BYTES
-    int keep = (int)(bufferPtr - buffer);
-
     if (keep > XML_CONTEXT_BYTES)
       keep = XML_CONTEXT_BYTES;
     neededSize += keep;