From 36c85b2c4639c06fd8e4398f1f7d29f5d4e0405f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Thu, 12 Dec 2013 20:25:44 +0100 Subject: [PATCH] updated for version 7.4.126 Problem: Compiler warnings for "const" and incompatible types. Solution: Remove "const", add type cast. (Ken Takata) --- src/os_win32.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) 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, /**/ -- 2.40.0