diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-04-27 22:38:30 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-04-27 22:38:30 +0200 |
| commit | 0ee1bdff7d34df5fb764a2af15594f9da34a47cc (patch) | |
| tree | 3f8134e3f6bc500205407044b94085be15764812 | |
| parent | 6ee9658774942f7448af700fc04df0335796a3db (diff) | |
| download | vim-git-0ee1bdff7d34df5fb764a2af15594f9da34a47cc.tar.gz | |
patch 8.1.1220: build fails on MS-Windowsv8.1.1220
Problem: Build fails on MS-Windows.
Solution: Move declaration to start of block.
| -rw-r--r-- | src/libvterm/src/state.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/libvterm/src/state.c b/src/libvterm/src/state.c index d6ac29deb..a08b005c2 100644 --- a/src/libvterm/src/state.c +++ b/src/libvterm/src/state.c @@ -1629,12 +1629,12 @@ static int on_resize(int rows, int cols, void *user) 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) diff --git a/src/version.c b/src/version.c index 638faad30..9fe5d2daf 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 */ /**/ + 1220, +/**/ 1219, /**/ 1218, |