summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-18 21:19:21 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-18 21:19:21 +0100
commit74a97b1ea0fe2c729e26718d0eec4164c8bed151 (patch)
treed2f5d9588fe89514b7a434c89e2970deb051718c
parent7f0608fb5219645d776fadfe13efb867c2460698 (diff)
downloadvim-git-74a97b1ea0fe2c729e26718d0eec4164c8bed151.tar.gz
patch 7.4.1349v7.4.1349
Problem: And some more MingW compiler warnings. (Cesar Romani) Solution: Add type casts.
-rw-r--r--src/if_mzsch.c4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index f291da71b..0a3c201f3 100644
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -1101,10 +1101,10 @@ startup_mzscheme(void)
MZ_GC_VAR_IN_REG(0, coll_path);
MZ_GC_REG();
/* workaround for dynamic loading on windows */
- s = vim_getenv("PLTCOLLECTS", &mustfree);
+ s = vim_getenv((char_u *)"PLTCOLLECTS", &mustfree);
if (s != NULL)
{
- coll_path = scheme_make_path(s);
+ coll_path = scheme_make_path((char *)s);
MZ_GC_CHECK();
if (mustfree)
vim_free(s);
diff --git a/src/version.c b/src/version.c
index d02a380b4..59f7f4bc8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1349,
+/**/
1348,
/**/
1347,