diff options
-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 1861df49a0..37cebc553a 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 ed479cd36b..a7af566162 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, |