diff options
| -rw-r--r-- | src/map.c | 2 | ||||
| -rw-r--r-- | src/os_win32.c | 2 | ||||
| -rw-r--r-- | src/proto/os_win32.pro | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 5 insertions, 3 deletions
@@ -1273,7 +1273,7 @@ ExpandMappings( int i; int fuzzy; int match; - int score; + int score = 0; fuzmatch_str_T *fuzmatch; fuzzy = cmdline_fuzzy_complete(pat); diff --git a/src/os_win32.c b/src/os_win32.c index da48bfd61..1adaaedce 100644 --- a/src/os_win32.c +++ b/src/os_win32.c @@ -8378,7 +8378,7 @@ stop_timeout(void) * This function is not expected to fail, but if it does it still returns a * valid flag pointer; the flag will remain stuck at zero. */ - const int * + volatile int * start_timeout(long msec) { BOOL ret; diff --git a/src/proto/os_win32.pro b/src/proto/os_win32.pro index 706cbd6d9..dd2c27e85 100644 --- a/src/proto/os_win32.pro +++ b/src/proto/os_win32.pro @@ -85,5 +85,5 @@ int get_conpty_fix_type(void); void resize_console_buf(void); char *GetWin32Error(void); void stop_timeout(void); -const int *start_timeout(long msec); +volatile int *start_timeout(long msec); /* vim: set ft=c : */ diff --git a/src/version.c b/src/version.c index 66dba1757..82ac4eaf2 100644 --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5125, +/**/ 5124, /**/ 5123, |