commit 0ee1bdff7d34df5fb764a2af15594f9da34a47cc
author Bram Moolenaar <Bram@vim.org> Sat Apr 27 22:38:30 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Apr 27 22:38:30 2019 +0200
tree 3f8134e3f6bc500205407044b94085be15764812
parent 6ee9658774942f7448af700fc04df0335796a3db

patch 8.1.1220: build fails on MS-Windows

Problem:    Build fails on MS-Windows.
Solution:   Move declaration to start of block.

src/libvterm/src/state.c

diff --git a/src/libvterm/src/state.c b/src/libvterm/src/state.c
index d6ac29d..a08b005 100644
--- a/src/libvterm/src/state.c
+++ b/src/libvterm/src/state.c
@@ -1629,12 +1629,12 @@
   VTermPos delta = { 0, 0 };
 
   if(cols != state->cols) {
+    int col;
     unsigned char *newtabstops = vterm_allocator_malloc(state->vt, (cols + 7) / 8);
     if (newtabstops == NULL)
       return 0;
 
     /* TODO: This can all be done much more efficiently bytewise */
-    int col;
     for(col = 0; col < state->cols && col < cols; col++) {
       unsigned char mask = 1 << (col & 7);
       if(state->tabstops[col >> 3] & mask)

src/version.c

diff --git a/src/version.c b/src/version.c
index 638faad..9fe5d2d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1220,
+/**/
     1219,
 /**/
     1218,