updated for version 7.3.870

Problem:    Compiler warnings when using MingW 4.5.3.
Solution:   Do not use MAKEINTRESOURCE. Adjust #if. (Ken Takata)

diff --git a/src/gui_w32.c b/src/gui_w32.c
index 04658d682416812a4c4870c4288cf095c8fd4f25..4ff89a323ba0c3f7b8fbba2ee765e4ac01e228ad 100644 (file)
--- a/src/gui_w32.c
+++ b/src/gui_w32.c
@@ -1614,7 +1614,7 @@ gui_mch_init(void)
 #endif
 
 #ifdef FEAT_EVAL
-# if _MSC_VER < 1400
+# ifndef HandleToLong
 /* HandleToLong() only exists in compilers that can do 64 bit builds */
 #  define HandleToLong(h) ((long)(h))
 # endif

diff --git a/src/gui_w48.c b/src/gui_w48.c
index 2a5f696512c1dd1c8b9a45a2aae1c92ad91f280d..083ac8004157dd001994b37d27ad065fbf0430b3 100644 (file)
--- a/src/gui_w48.c
+++ b/src/gui_w48.c
@@ -3265,27 +3265,27 @@ gui_mch_settitle(
  * misc2.c! */
 static LPCSTR mshape_idcs[] =
 {
-    MAKEINTRESOURCE(IDC_ARROW),                /* arrow */
-    MAKEINTRESOURCE(0),                        /* blank */
-    MAKEINTRESOURCE(IDC_IBEAM),                /* beam */
-    MAKEINTRESOURCE(IDC_SIZENS),       /* updown */
-    MAKEINTRESOURCE(IDC_SIZENS),       /* udsizing */
-    MAKEINTRESOURCE(IDC_SIZEWE),       /* leftright */
-    MAKEINTRESOURCE(IDC_SIZEWE),       /* lrsizing */
-    MAKEINTRESOURCE(IDC_WAIT),         /* busy */
+    IDC_ARROW,                 /* arrow */
+    MAKEINTRESOURCE(0),                /* blank */
+    IDC_IBEAM,                 /* beam */
+    IDC_SIZENS,                        /* updown */
+    IDC_SIZENS,                        /* udsizing */
+    IDC_SIZEWE,                        /* leftright */
+    IDC_SIZEWE,                        /* lrsizing */
+    IDC_WAIT,                  /* busy */
 #ifdef WIN3264
-    MAKEINTRESOURCE(IDC_NO),           /* no */
+    IDC_NO,                    /* no */
 #else
-    MAKEINTRESOURCE(IDC_ICON),         /* no */
-#endif
-    MAKEINTRESOURCE(IDC_ARROW),                /* crosshair */
-    MAKEINTRESOURCE(IDC_ARROW),                /* hand1 */
-    MAKEINTRESOURCE(IDC_ARROW),                /* hand2 */
-    MAKEINTRESOURCE(IDC_ARROW),                /* pencil */
-    MAKEINTRESOURCE(IDC_ARROW),                /* question */
-    MAKEINTRESOURCE(IDC_ARROW),                /* right-arrow */
-    MAKEINTRESOURCE(IDC_UPARROW),      /* up-arrow */
-    MAKEINTRESOURCE(IDC_ARROW)         /* last one */
+    IDC_ICON,                  /* no */
+#endif
+    IDC_ARROW,                 /* crosshair */
+    IDC_ARROW,                 /* hand1 */
+    IDC_ARROW,                 /* hand2 */
+    IDC_ARROW,                 /* pencil */
+    IDC_ARROW,                 /* question */
+    IDC_ARROW,                 /* right-arrow */
+    IDC_UPARROW,               /* up-arrow */
+    IDC_ARROW                  /* last one */
 };
 
     void
@@ -3298,7 +3298,7 @@ mch_set_mouse_shape(int shape)
     else
     {
        if (shape >= MSHAPE_NUMBERED)
-           idc = MAKEINTRESOURCE(IDC_ARROW);
+           idc = IDC_ARROW;
        else
            idc = mshape_idcs[shape];
 #ifdef SetClassLongPtr

diff --git a/src/os_mswin.c b/src/os_mswin.c
index 7cc1854530a9f3e021cca90224cf711b1688826e..e8000aa6b6fa549f4bfa6ac2ea74fa3f1dcbb18b 100644 (file)
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -184,12 +184,14 @@ char * _fullpath(char *buf, char *fname, int len)
 }
 # endif
 
+# if !defined(__MINGW32__) || (__GNUC__ < 4)
 int _chdrive(int drive)
 {
     char temp [3] = "-:";
     temp[0] = drive + 'A' - 1;
     return !SetCurrentDirectory(temp);
 }
+# endif
 #else
 # ifdef __BORLANDC__
 /* being a more ANSI compliant compiler, BorlandC doesn't define _stricoll:

diff --git a/src/os_win32.c b/src/os_win32.c
index f5a3a5707689e18998ad48bd548bde55d4c7bef1..d16cab351722b9086283f5d2265ce55b934fff04 100644 (file)
--- a/src/os_win32.c
+++ b/src/os_win32.c
@@ -163,7 +163,7 @@ static PFNGCKLN    s_pfnGetConsoleKeyboardLayoutName = NULL;
 
 /* Enable common dialogs input unicode from IME if posible. */
 #ifdef FEAT_MBYTE
-LRESULT (WINAPI *pDispatchMessage)(LPMSG) = DispatchMessage;
+LRESULT (WINAPI *pDispatchMessage)(CONST MSG *) = DispatchMessage;
 BOOL (WINAPI *pGetMessage)(LPMSG, HWND, UINT, UINT) = GetMessage;
 BOOL (WINAPI *pIsDialogMessage)(HWND, LPMSG) = IsDialogMessage;
 BOOL (WINAPI *pPeekMessage)(LPMSG, HWND, UINT, UINT, UINT) = PeekMessage;
@@ -3464,7 +3464,7 @@ sub_process_writer(LPVOID param)
                    && (lnum != curbuf->b_ml.ml_line_count
                        || curbuf->b_p_eol)))
            {
-               WriteFile(g_hChildStd_IN_Wr, "\n", 1, &ignored, NULL);
+               WriteFile(g_hChildStd_IN_Wr, "\n", 1, (LPDWORD)&ignored, NULL);
            }
 
            ++lnum;

diff --git a/src/os_win32.h b/src/os_win32.h
index 71b7609564637fd92b9c4595a8a0a3830837b8c3..f672ea803457a333fe5f0dfa8bdb089a384109a8 100644 (file)
--- a/src/os_win32.h
+++ b/src/os_win32.h
@@ -204,7 +204,7 @@ Trace(char *pszFormat, ...);
 /* Enable common dialogs input unicode from IME if posible. */
 #ifdef FEAT_MBYTE
     /* The variables are defined in os_win32.c. */
-extern LRESULT (WINAPI *pDispatchMessage)(LPMSG);
+extern LRESULT (WINAPI *pDispatchMessage)(CONST MSG *);
 extern BOOL (WINAPI *pGetMessage)(LPMSG, HWND, UINT, UINT);
 extern BOOL (WINAPI *pIsDialogMessage)(HWND, LPMSG);
 extern BOOL (WINAPI *pPeekMessage)(LPMSG, HWND, UINT, UINT, UINT);

diff --git a/src/version.c b/src/version.c
index 9eb46cae654246267fc98affc28c0e7d5892d542..7705a21f325eb5cf155daa1fcd548655003c3552 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    870,
 /**/
     869,
 /**/