updated for version 7.4.126

Problem:    Compiler warnings for "const" and incompatible types.
Solution:   Remove "const", add type cast. (Ken Takata)

diff --git a/src/os_win32.c b/src/os_win32.c
index 182c88c6ed062a6157215f10dff4bdf6ecb355cf..04e81ceb15a6e0d6d889ff76bad40c72d4b5bf6b 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -3830,7 +3830,7 @@ mch_set_winsize_now(void)
 
     static BOOL
 vim_create_process(
-    const char         *cmd,
+    char               *cmd,
     DWORD              flags,
     BOOL               inherit_handles,
     STARTUPINFO                *si,
@@ -3853,7 +3853,7 @@ vim_create_process(
                flags,                  /* Creation flags */
                NULL,                   /* Environment */
                NULL,                   /* Current directory */
-               si,                     /* Startup information */
+               (LPSTARTUPINFOW)si,     /* Startup information */
                pi);                    /* Process information */
            vim_free(wcmd);
            return ret;

diff --git a/src/version.c b/src/version.c
index d4cc3d73dcc0df2a520ef7ca3ad7e5f2f3257221..27771952804eb8184df2b4e0cf16ab161db287a0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -738,6 +738,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    126,
 /**/
     125,
 /**/