From 819ab82f7ee505d6fc4c6dc408e4b27c0fbe4a97 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 13 Jun 2022 22:34:14 +0100 Subject: [PATCH] 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) --- src/os_mswin.c | 6 +++--- src/version.c | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/os_mswin.c b/src/os_mswin.c index 48a6972035..448b2bf29c 100644 --- 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 eef7e5165c..b1f4254dc3 100644 --- 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, /**/ -- 2.47.2