patch 7.4.1870

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

diff --git a/src/if_mzsch.c b/src/if_mzsch.c
index 1861df49a02a6369c23ba0f3b271f4a213f4019f..37cebc553a48c3338071ce369cdefe1d0253d768 100644 (file)
--- a/src/if_mzsch.c
+++ b/src/if_mzsch.c
@@ -849,7 +849,7 @@ static long range_end;
 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)

diff --git a/src/version.c b/src/version.c
index ed479cd36b1291ebbb69e7fe5752136ed10c0f04..a7af56616208accc45e81c41d37d22db2eaa4f72 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -753,6 +753,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1870,
 /**/
     1869,
 /**/