patch 8.2.0671: Haiku: compiler warnings

brammool · brammool · commit 9e175141f343 · 2020-04-30T22:51:01.000+02:00
Problem:    Haiku: compiler warnings.
Solution:   Avoid the warnings. Drop display_errors() copy. (Emir Sari,
            closes #6018)
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ src/xxd/xxd
 src/auto/if_perl.c
 src/auto/gui_gtk_gresources.c
 src/auto/gui_gtk_gresources.h
+src/auto/os_haiku.rdef
 src/objects/.dirstamp
 src/objects
 src/tags
diff --git a/src/gui.c b/src/gui.c
@@ -5107,7 +5107,8 @@ gui_find_iconfile(char_u *name, char_u *buffer, char *ext)
 # endif
 #endif
 
-#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11) || defined(PROTO)
+#if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11)|| defined(FEAT_GUI_HAIKU) \
+	|| defined(PROTO)
     void
 display_errors(void)
 {
diff --git a/src/gui_haiku.cc b/src/gui_haiku.cc
@@ -551,7 +551,7 @@ struct VimMsg {
 };
 
 #define RGB(r, g, b)	((char_u)(r) << 16 | (char_u)(g) << 8 | (char_u)(b) << 0)
-#define GUI_TO_RGB(g)	{ (g) >> 16, (g) >> 8, (g) >> 0, 255 }
+#define GUI_TO_RGB(g)	{ (char_u)((g) >> 16), (char_u)((g) >> 8), (char_u)((g) >> 0), 255 }
 
 // ---------------- end of header part ----------------
 
@@ -3990,40 +3990,6 @@ gui_mch_adjust_charheight()
     return OK;
 }
 
-/*
- * Display the saved error message(s).
- */
-#ifdef USE_MCH_ERRMSG
-    void
-display_errors(void)
-{
-    char    *p;
-    char_u  pError[256];
-
-    if (error_ga.ga_data == NULL)
-    return;
-
-    // avoid putting up a message box with blanks only
-    for (p = (char *)error_ga.ga_data; *p; ++p)
-    if (!isspace(*p))
-    {
-	if (STRLEN(p) > 255)
-	pError[0] = 255;
-	else
-	pError[0] = STRLEN(p);
-
-	STRNCPY(&pError[1], p, pError[0]);
-//	ParamText(pError, nil, nil, nil);
-//	Alert(128, nil);
-	break;
-	// TODO: handled message longer than 256 chars
-	//   use auto-sizeable alert
-	//   or dialog with scrollbars (TextEdit zone)
-    }
-    ga_clear(&error_ga);
-}
-#endif
-
     void
 gui_mch_getmouse(int *x, int *y)
 {
diff --git a/src/version.c b/src/version.c
@@ -746,6 +746,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    671,
 /**/
     670,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -5107,7 +5107,8 @@ gui_find_iconfile(char_u name, char_u buffer, char *ext)`
`5107`	`5107`	`# endif`
`5108`	`5108`	`#endif`
`5109`	`5109`
`5110`		`-#if defined(FEAT_GUI_GTK) \|\| defined(FEAT_GUI_X11) \|\| defined(PROTO)`
	`5110`	`+#if defined(FEAT_GUI_GTK) \|\| defined(FEAT_GUI_X11)\|\| defined(FEAT_GUI_HAIKU) \`
	`5111`	`+ \|\| defined(PROTO)`
`5111`	`5112`	`void`
`5112`	`5113`	`display_errors(void)`
`5113`	`5114`	`{`