summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-04-27 22:45:00 +0200
committerBram Moolenaar <Bram@vim.org>2019-04-27 22:45:00 +0200
commitdcaa54dded7c7ef9b2217a205d23301d313e96dc (patch)
tree5bb371d0a019564c7de9dc4874ccf549e5d47b27
parentad6dc49a7564a99fca36c1928e3865787d3bd5b2 (diff)
downloadvim-git-8.1.1222.tar.gz
patch 8.1.1222: build still fails on MS-Windowsv8.1.1222
Problem: Build still fails on MS-Windows. Solution: Move another declaration to start of block.
-rw-r--r--src/libvterm/src/state.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libvterm/src/state.c b/src/libvterm/src/state.c
index a08b005c2..b50e3667a 100644
--- a/src/libvterm/src/state.c
+++ b/src/libvterm/src/state.c
@@ -1656,11 +1656,11 @@ static int on_resize(int rows, int cols, void *user)
}
if(rows != state->rows) {
+ int row;
VTermLineInfo *newlineinfo = vterm_allocator_malloc(state->vt, rows * sizeof(VTermLineInfo));
if (newlineinfo == NULL)
return 0;
- int row;
for(row = 0; row < state->rows && row < rows; row++) {
newlineinfo[row] = state->lineinfo[row];
}
diff --git a/src/version.c b/src/version.c
index c65c541ac..1bdcaaf0a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1222,
+/**/
1221,
/**/
1220,