Mercurial > vim

changeset 9173:b64c314a4990 v7.4.1870

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Christian Brabandt <cb@256bit.org>
date Thu, 02 Jun 2016 12:00:07 +0200
parents 41c1e22a3ec0
children 650a14c77ccf
files src/if_mzsch.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
--- 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,