Mercurial > vim
changeset 35244:8f04cf65ecff v9.1.0432
patch 9.1.0432: Ancient XPM preprocessor hack may cause build errors
Commit: https://github.com/vim/vim/commit/5090f838bbcd3a13433d9fe20a94f3ce6b796eb1
Author: Drew Vogel <dvogel@github>
Date: Wed May 22 16:51:53 2024 +0200
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>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 22 May 2024 17:00:06 +0200 |
| parents | 05e34d7c76dd |
| children | 66bb9dc0fe1f |
| files | runtime/vim16x16.xpm runtime/vim32x32.xpm runtime/vim48x48.xpm src/gui_gtk_x11.c src/gui_x11.c src/version.c |
| diffstat | 6 files changed, 5 insertions(+), 28 deletions(-) [+] |
line wrap: on
line diff
--- 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",
--- 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",
--- 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",
--- 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);
--- 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;