diff options
| author | Yasuhiro Matsumoto <mattn.jp@gmail.com> | 2022-06-18 16:48:36 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-18 16:48:36 +0100 |
| commit | 09f68a5e7817cbb40854ee6b8ae3db21d5365346 (patch) | |
| tree | a59c32d01569efa54ef7ab411b2af92cc3b5823f | |
| parent | 620aa8eb5b1468d086253f8aa787a33a86033100 (diff) | |
patch 8.2.5125: MS-Windows: warnings from MinGW compilerv8.2.5125
Problem: MS-Windows: warnings from MinGW compyler.
Solution: Use "volatile". (Yasuhiro Matsumoto, closes #10589) Initialize
variable.
| -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 da48bfd615..1adaaedcea 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 706cbd6d90..dd2c27e85e 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 66dba1757f..82ac4eaf2d 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, |