patch 8.2.5085: gcc gives warning for signed/unsigned difference

Problem:    Gcc gives warning for signed/unsigned difference.
Solution:   Use a different pointer type. (John Marriott)

diff --git a/src/os_mswin.c b/src/os_mswin.c
index 48a697203595b305f8f02262e65191aaf1cb64b3..448b2bf29c7ffdec3442831b447e62470946f1cb 100644 (file)
--- a/src/os_mswin.c
+++ b/src/os_mswin.c
@@ -664,7 +664,7 @@ mch_suspend(void)
 display_errors(void)
 {
 # ifdef FEAT_GUI
-    char *p;
+    char_u *p;
 
 #  ifdef VIMDLL
     if (gui.in_use || gui.starting)
@@ -673,7 +673,7 @@ display_errors(void)
        if (error_ga.ga_data != NULL)
        {
            // avoid putting up a message box with blanks only
-           for (p = (char *)error_ga.ga_data; *p; ++p)
+           for (p = (char_u *)error_ga.ga_data; *p; ++p)
                if (!isspace(*p))
                {
                    // Only use a dialog when not using --gui-dialog-file:
@@ -684,7 +684,7 @@ display_errors(void)
                                             VIM_ERROR,
                                     gui.starting ? (char_u *)_("Message") :
                                             (char_u *)_("Error"),
-                                    (char_u *)p, (char_u *)_("&Ok"),
+                                            p, (char_u *)_("&Ok"),
                                        1, NULL, FALSE);
                    break;
                }

diff --git a/src/version.c b/src/version.c
index eef7e5165cda7c653f60df1f1511d5d3b203cd07..b1f4254dc34bfc11d789e604685f089892beaaae 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 */
+/**/
+    5085,
 /**/
     5084,
 /**/