patch 8.1.0855: cannot build xxd with MSVC 10

Problem:    Cannot build xxd with MSVC 10.
Solution:   Move declaration to start of block.

diff --git a/src/version.c b/src/version.c
index c1196431b47508764d9163b22d3aa6425dfe992a..4080d5ece8bc57dd7d4aadafb56daa09a5423d70 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -783,6 +783,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    855,
 /**/
     854,
 /**/

diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index b8761fc29c8156e12621140dc55d50f86277b275..c24089e4ed2fa5fc1cf3c6cc67f6b2a3b5a90659 100644 (file)
--- a/src/xxd/xxd.c
+++ b/src/xxd/xxd.c
@@ -472,6 +472,7 @@ main(int argc, char *argv[])
   unsigned long displayoff = 0;
   static char l[LLEN+1];  /* static because it may be too big for stack */
   char *pp;
+  int addrlen = 9;
 
 #ifdef AMIGA
   /* This program doesn't work when started from the Workbench */
@@ -820,7 +821,6 @@ main(int argc, char *argv[])
   else /* hextype == HEX_BITS */
     grplen = 8 * octspergrp + 1;
 
-  int addrlen = 9;
   e = 0;
   while ((length < 0 || n < length) && (e = getc(fp)) != EOF)
     {