# HG changeset patch # User Bram Moolenaar # Date 1386876344 -3600 # Node ID b14554844756422a39c72e62b8c2391c2d5a2e17 # Parent 7818ca6de3d07439571bc1fe788a3efff6979531 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 --- 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 --- 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,