summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-01-31 11:00:42 +0100
committerBram Moolenaar <Bram@vim.org>2019-01-31 11:00:42 +0100
commitaf703585a34aa30bb5bdf8c05e4be8b3c66f787a (patch)
treef0ebc16a985a5cf74ec73e0f3e11f2705047af76
parentd8c56a0d29ccb53e12c6dec73b9a0e8a6dad99c2 (diff)
patch 8.1.0855: cannot build xxd with MSVC 10v8.1.0855
Problem: Cannot build xxd with MSVC 10. Solution: Move declaration to start of block.
-rw-r--r--src/version.c2
-rw-r--r--src/xxd/xxd.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/version.c b/src/version.c
index c1196431b4..4080d5ece8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -784,6 +784,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 855,
+/**/
854,
/**/
853,
diff --git a/src/xxd/xxd.c b/src/xxd/xxd.c
index b8761fc29c..c24089e4ed 100644
--- 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)
{