From af703585a34aa30bb5bdf8c05e4be8b3c66f787a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 31 Jan 2019 11:00:42 +0100 Subject: [PATCH] patch 8.1.0855: cannot build xxd with MSVC 10 Problem: Cannot build xxd with MSVC 10. Solution: Move declaration to start of block. --- src/version.c | 2 ++ src/xxd/xxd.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/version.c b/src/version.c index c1196431b..4080d5ece 100644 --- 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 b8761fc29..c24089e4e 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) { -- 2.50.1