From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 12 Dec 2013 19:25:44 +0000 (+0100)
Subject: updated for version 7.4.126
X-Git-Tag: v7.4.126
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36c85b2c4639c06fd8e4398f1f7d29f5d4e0405f;p=vim

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 182c88c6e..04e81ceb1 100644
--- 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 d4cc3d73d..277719528 100644
--- 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,
 /**/