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 f291da71b75db295549841a6680574a28948ea19..0a3c201f37be22f268d9a174f837301ffad240e4 100644 (file)
--- 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 d02a380b42f5f373fe8935c68d641d6278d0fd08..59f7f4bc8f008f08ccf8d069e826c19c1391dd32 100644 (file)
--- 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,
 /**/