summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-12-23 13:36:40 +0100
committerBram Moolenaar <Bram@vim.org>2018-12-23 13:36:40 +0100
commit80dae04d690d9aba26d443d4a19f3bd45ed0990b (patch)
treee34a2cf54cf111c617f1437cc616bfa861dcd8c7
parent9123c0b31a283f460ed2b6af95080120cf528118 (diff)
downloadvim-git-8.1.0628.tar.gz
patch 8.1.0628: Compiler warning on MS-Windows.v8.1.0628
Problem: Compiler warning on MS-Windows. Solution: Add type cast. (Mike Williams)
-rw-r--r--src/if_py_both.h2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 1a4ef462e..1c159260c 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -2953,7 +2953,7 @@ FunctionNew(PyTypeObject *subtype, char_u *name, int argc, typval_T *argv,
char_u *np;
size_t len = STRLEN(p) + 1;
- if ((np = alloc(len + 2)) == NULL)
+ if ((np = alloc((int)len + 2)) == NULL)
{
vim_free(p);
return NULL;
diff --git a/src/version.c b/src/version.c
index 101d7864d..ff22c6d50 100644
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 628,
+/**/
627,
/**/
626,