summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-03 20:54:57 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-03 20:54:57 +0200
commit4c38d66d25e4ba433fe87283a4664425a3dbd529 (patch)
treef8a624122e878ab589ffebf0fbc637f8886e4b6d
parent7cba71d7e3576639679b6a3aedeeb1ac07f7f2f5 (diff)
patch 7.4.2150v7.4.2150
Problem: Warning with MinGW 64. (John Marriott) Solution: Change return type. (Ken Takata)
-rw-r--r--src/os_win32.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/os_win32.c b/src/os_win32.c
index 71221776d7..54f2e887fb 100644
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -4212,7 +4212,7 @@ mch_system_classic(char *cmd, int options)
* process. This way avoid to hang up vim totally if the children
* process take a long time to process the lines.
*/
- static DWORD WINAPI
+ static unsigned int __stdcall
sub_process_writer(LPVOID param)
{
HANDLE g_hChildStd_IN_Wr = param;
diff --git a/src/version.c b/src/version.c
index f6d56d1d3c..c50088e32f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2150,
+/**/
2149,
/**/
2148,