From c7a3785a5cf37fb89d9804a58bc29a9064dd7c7f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 14 Mar 2016 00:12:07 +0100 Subject: [PATCH] Avoid mixing code and declarations in C expat code Some compilers, notably MSVC, don't support C99 and C89 doesn't allow this. Fixes MSVS compilation after 7e22fb4f64eeffdd7b01c8f342c7eefcad5b27c9. --- src/expat/lib/xmlparse.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/expat/lib/xmlparse.c b/src/expat/lib/xmlparse.c index 322c8eeee6..dbf5687613 100644 --- a/src/expat/lib/xmlparse.c +++ b/src/expat/lib/xmlparse.c @@ -1703,13 +1703,16 @@ XML_GetBuffer(XML_Parser parser, int len) } if (len > bufferLim - bufferEnd) { +#ifdef XML_CONTEXT_BYTES + int keep; +#endif 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); + keep = (int)(bufferPtr - buffer); if (keep > XML_CONTEXT_BYTES) keep = XML_CONTEXT_BYTES;