summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-05-28 23:32:47 +0200
committerBram Moolenaar <Bram@vim.org>2019-05-28 23:32:47 +0200
commit59edb00e2219d4eda34b32a5d405f245053c5b74 (patch)
treef874ae4fc29c6bc6dccaa971e7845aaf1aff553d
parentc799fe206e61f2e2c1231bc46cbe4bb354f3da69 (diff)
downloadvim-git-59edb00e2219d4eda34b32a5d405f245053c5b74.tar.gz
patch 8.1.1415: build error in MS-Windows GUIv8.1.1415
Problem: Build error in MS-Windows GUI. Solution: Fix the LALLOC_MULT() argument.
-rw-r--r--src/gui_w32.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c
index 0f683b8a1..5600ac0c2 100644
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -6056,7 +6056,7 @@ gui_mch_draw_string(
/* Don't give an out-of-memory message here, it would call us
* recursively. */
- padding = LALLOC_MULT(sizeof(int), pad_size);
+ padding = LALLOC_MULT(int, pad_size);
if (padding != NULL)
for (i = 0; i < pad_size; i++)
padding[i] = gui.char_width;
diff --git a/src/version.c b/src/version.c
index c955bbb59..eac5b026e 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 */
/**/
+ 1415,
+/**/
1414,
/**/
1413,