From: Bram Moolenaar Date: Thu, 18 Feb 2016 20:19:21 +0000 (+0100) Subject: patch 7.4.1349 X-Git-Tag: v7.4.1349 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=74a97b1ea0fe2c729e26718d0eec4164c8bed151;p=thirdparty%2Fvim.git patch 7.4.1349 Problem: And some more MingW compiler warnings. (Cesar Romani) Solution: Add type casts. --- diff --git a/src/if_mzsch.c b/src/if_mzsch.c index f291da71b7..0a3c201f37 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 d02a380b42..59f7f4bc8f 100644 --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1349, /**/ 1348, /**/