diff --git a/src/os_win32.c b/src/os_win32.c index 740c35a0ab..10bbb6c8df 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -175,12 +175,12 @@ static int conpty_working = 0; static int conpty_type = 0; static int conpty_stable = 0; static int conpty_fix_type = 0; -static void vtp_flag_init(); +static void vtp_flag_init(void); #if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL) static int vtp_working = 0; -static void vtp_init(); -static void vtp_exit(); +static void vtp_init(void); +static void vtp_exit(void); static void vtp_sgr_bulk(int arg); static void vtp_sgr_bulks(int argc, int *argv); @@ -8994,9 +8994,7 @@ static sig_atomic_t *timeout_flag = &timeout_flags[0]; static void CALLBACK set_flag(void *param, BOOLEAN unused2 UNUSED) { - int *timeout_flag = (int *)param; - - *timeout_flag = TRUE; + *(sig_atomic_t *)param = TRUE; } /* diff --git a/src/version.c b/src/version.c index adb5654bcd..5366f3f2ee 100644 --- a/src/version.c +++ b/src/version.c @@ -709,6 +709,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1414, /**/ 1413, /**/