patch 8.2.5125: MS-Windows: warnings from MinGW compiler

Problem:    MS-Windows: warnings from MinGW compyler.
Solution:   Use "volatile". (Yasuhiro Matsumoto, closes #10589)  Initialize
            variable.

diff --git a/src/map.c b/src/map.c
index 9570285cd7873f1e38c3121ff74d201a77cc713f..2850a3fe249dd1807bc4cc5d025c873431daf4b8 100644 (file)
--- a/src/map.c
+++ b/src/map.c
@@ -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 da48bfd615ad80c1e252b6531cc278af29b4da04..1adaaedcea42825e16a52dbf85647824429e9409 100644 (file)
--- 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 706cbd6d9015e728e2c56cda0b1247020b1f9cc7..dd2c27e85ea0d6649fce50eec693634451718c96 100644 (file)
--- 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 66dba1757f7417f72530f079f098cc2687091313..82ac4eaf2dd99eceb9043f1a787e11725fb23851 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5125,
 /**/
     5124,
 /**/