changeset 5556:b14554844756 v7.4.126

updated for version 7.4.126 Problem: Compiler warnings for "const" and incompatible types. Solution: Remove "const", add type cast. (Ken Takata)
author Bram Moolenaar <bram@vim.org>
date Thu, 12 Dec 2013 20:25:44 +0100
parents 7818ca6de3d0
children 3eb577298089
files src/os_win32.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    126,
+/**/
     125,
 /**/
     124,