# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1464861607 -7200
# Node ID b64c314a49905769805dbe4ca944477f994f515a
# Parent  41c1e22a3ec02494ecb170a2596a7bd797ca4a2b
commit https://github.com/vim/vim/commit/dec6c7beda5491b28f67f430fc9d01467050c1ca
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Jun 2 11:57:38 2016 +0200

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1870,
+/**/
     1869,
 /**/
     1868,