patch 8.0.1709: some non-C89 code may slip through
Problem: Some non-C89 code may slip through.
Solution: Enforce C89 in configure. Fix detected problems. (James McCoy,
closes #2735)
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index bb679bd..9c7e8d5 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -5607,15 +5607,17 @@
guicolor_T
gui_mch_get_color(char_u *name)
{
+ guicolor_T color = INVALCOLOR;
+
if (!gui.in_use) /* can't do this when GUI not running */
- return INVALCOLOR;
+ return color;
+
+ if (name != NULL)
+ color = gui_get_color_cmn(name);
#if GTK_CHECK_VERSION(3,0,0)
- return name != NULL ? gui_get_color_cmn(name) : INVALCOLOR;
+ return color;
#else
- guicolor_T color;
-
- color = (name != NULL) ? gui_get_color_cmn(name) : INVALCOLOR;
if (color == INVALCOLOR)
return INVALCOLOR;