diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-06-02 11:57:38 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-06-02 11:57:38 +0200 |
| commit | dec6c7beda5491b28f67f430fc9d01467050c1ca (patch) | |
| tree | 6f940e8e1f7470e8e3631a69cc5283f6de8a8232 | |
| parent | cf190c6f017563de1bdbf854b3376522b8b2748f (diff) | |
| download | vim-git-dec6c7beda5491b28f67f430fc9d01467050c1ca.tar.gz | |
patch 7.4.1870v7.4.1870
Problem: One more Win64 compiler warning.
Solution: Change declared argument type. (Ken Takata)
| -rw-r--r-- | src/if_mzsch.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/if_mzsch.c b/src/if_mzsch.c index 1861df49a..37cebc553 100644 --- 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 ed479cd36..a7af56616 100644 --- 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, |