commit dec6c7beda5491b28f67f430fc9d01467050c1ca
author Bram Moolenaar <Bram@vim.org> Thu Jun 02 11:57:38 2016 +0200
committer Bram Moolenaar <Bram@vim.org> Thu Jun 02 11:57:38 2016 +0200
tree 6f940e8e1f7470e8e3631a69cc5283f6de8a8232
parent cf190c6f017563de1bdbf854b3376522b8b2748f

patch 7.4.1870
Problem:    One more Win64 compiler warning.
Solution:   Change declared argument type. (Ken Takata)

src/if_mzsch.c

diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 1861df4..37cebc5 100644
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -849,7 +849,7 @@
 static int mz_threads_allow = 0;
 
 #if defined(FEAT_GUI_W32)
-static void CALLBACK timer_proc(HWND, UINT, UINT, DWORD);
+static void CALLBACK timer_proc(HWND, UINT, UINT_PTR, DWORD);
 static UINT timer_id = 0;
 #elif defined(FEAT_GUI_GTK)
 # if GTK_CHECK_VERSION(3,0,0)

src/version.c

diff --git a/src/version.c b/src/version.c
index ed479cd..a7af566 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1870,
+/**/
     1869,
 /**/
     1868,