diff options
| author | Drew Vogel <dvogel@github> | 2024-05-22 16:51:53 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-05-22 16:51:53 +0200 |
| commit | 5090f838bbcd3a13433d9fe20a94f3ce6b796eb1 (patch) | |
| tree | b22ab7d1d863db2ce779b3d71b82e9a2c2331947 | |
| parent | 802fc04a78a7d98673dc9171d4b89597447a5bda (diff) | |
patch 9.1.0432: Ancient XPM preprocessor hack may cause build errorsv9.1.0432
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>
| -rw-r--r-- | runtime/vim16x16.xpm | 2 | ||||
| -rw-r--r-- | runtime/vim32x32.xpm | 2 | ||||
| -rw-r--r-- | runtime/vim48x48.xpm | 2 | ||||
| -rw-r--r-- | src/gui_gtk_x11.c | 14 | ||||
| -rw-r--r-- | src/gui_x11.c | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
6 files changed, 5 insertions, 28 deletions
diff --git a/runtime/vim16x16.xpm b/runtime/vim16x16.xpm index cb75b71781..9b55218cc0 100644 --- a/runtime/vim16x16.xpm +++ b/runtime/vim16x16.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * vim16x16[] = { +static const char * vim16x16[] = { "16 16 8 1", " c None", ". c #000000", diff --git a/runtime/vim32x32.xpm b/runtime/vim32x32.xpm index 43a3a40c0b..017b93b6f8 100644 --- a/runtime/vim32x32.xpm +++ b/runtime/vim32x32.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * vim32x32[] = { +static const char * vim32x32[] = { "32 32 8 1", " c None", ". c #000000", diff --git a/runtime/vim48x48.xpm b/runtime/vim48x48.xpm index b2fdd95924..8bd08bc5a3 100644 --- a/runtime/vim48x48.xpm +++ b/runtime/vim48x48.xpm @@ -1,5 +1,5 @@ /* XPM */ -static char * vim48x48[] = { +static const char * vim48x48[] = { "48 48 8 1", " c None", ". c #000000", diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 4d201fcaed..066aa17456 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -2704,23 +2704,9 @@ global_event_filter(GdkXEvent *xev, 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 fc63658f8d..edde6b55c5 100644 --- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -1363,20 +1363,9 @@ gui_mch_init(void) #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 ca8af16900..b37dbcf857 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 432, +/**/ 431, /**/ 430, |