patch 9.1.0432: Ancient XPM preprocessor hack may cause build errors
Problem: Ancient XPM preprocessor hack may cause build errors.
Solution: Simplify XPM includes and get rid of complicated #ifdef magic
(Drew Vogel).
closes: #14816
Signed-off-by: Drew Vogel <dvogel@github>
Signed-off-by: Christian Brabandt <cb@256bit.org>
diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c
index 4d201fc..066aa17 100644
--- a/src/gui_gtk_x11.c
+++ b/src/gui_gtk_x11.c
@@ -2704,23 +2704,9 @@
static void
mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED)
{
-// If you get an error message here, you still need to unpack the runtime
-// archive!
-#ifdef magick
-# undef magick
-#endif
- // A bit hackish, but avoids casting later and allows optimization
-# define static static const
-#define magick vim32x32
#include "../runtime/vim32x32.xpm"
-#undef magick
-#define magick vim16x16
#include "../runtime/vim16x16.xpm"
-#undef magick
-#define magick vim48x48
#include "../runtime/vim48x48.xpm"
-#undef magick
-# undef static
GdkWindow * const mainwin_win = gtk_widget_get_window(gui.mainwin);
diff --git a/src/gui_x11.c b/src/gui_x11.c
index fc63658..edde6b5 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -1363,20 +1363,9 @@
#else
// Use Pixmaps, looking much nicer.
-// If you get an error message here, you still need to unpack the runtime
-// archive!
-# ifdef magick
-# undef magick
-# endif
-# define magick vim32x32
# include "../runtime/vim32x32.xpm"
-# undef magick
-# define magick vim16x16
# include "../runtime/vim16x16.xpm"
-# undef magick
-# define magick vim48x48
# include "../runtime/vim48x48.xpm"
-# undef magick
static Pixmap icon = 0;
static Pixmap icon_mask = 0;
diff --git a/src/version.c b/src/version.c
index ca8af16..b37dbcf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 432,
+/**/
431,
/**/
430,