changeset 15695:ac05f8fb4200 v8.1.0855

patch 8.1.0855: cannot build xxd with MSVC 10 commit https://github.com/vim/vim/commit/af703585a34aa30bb5bdf8c05e4be8b3c66f787a Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 31 11:00:42 2019 +0100 patch 8.1.0855: cannot build xxd with MSVC 10 Problem: Cannot build xxd with MSVC 10. Solution: Move declaration to start of block.
author Bram Moolenaar <Bram@vim.org>
date Thu, 31 Jan 2019 11:15:07 +0100
parents 1a8f97622760
children 2cc75ec8bda2
files src/version.c src/xxd/xxd.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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,
--- 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)
     {