aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-08-26 20:03:41 -04:00
Code

patch 9.1.0432: Ancient XPM preprocessor hack may cause build errors

Browse Source 
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>
This commit is contained in:
Drew Vogel 2024-05-22 16:51:53 +02:00 committed by Christian Brabandt
parent 802fc04a78
commit 5090f838bb
No known key found for this signature in database
GPG Key ID: F3F92DA383FDDE09
6 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/vim16x16.xpm
View File

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
static char * vim16x16[] = { static const char * vim16x16[] = {
"16 16 8 1", "16 16 8 1",
" c None", " c None",
". c #000000", ". c #000000",

2
runtime/vim32x32.xpm
View File

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
static char * vim32x32[] = { static const char * vim32x32[] = {
"32 32 8 1", "32 32 8 1",
" c None", " c None",
". c #000000", ". c #000000",

2
runtime/vim48x48.xpm
View File

@ -1,5 +1,5 @@
/* XPM */ /* XPM */
static char * vim48x48[] = { static const char * vim48x48[] = {
"48 48 8 1", "48 48 8 1",
" c None", " c None",
". c #000000", ". c #000000",

14
src/gui_gtk_x11.c
View File

@ -2704,23 +2704,9 @@ global_event_filter(GdkXEvent *xev,
static void static void
mainwin_realize(GtkWidget *widget UNUSED, gpointer data UNUSED) 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" #include "../runtime/vim32x32.xpm"
#undef magick
#define magick vim16x16
#include "../runtime/vim16x16.xpm" #include "../runtime/vim16x16.xpm"
#undef magick
#define magick vim48x48
#include "../runtime/vim48x48.xpm" #include "../runtime/vim48x48.xpm"
#undef magick
# undef static
GdkWindow * const mainwin_win = gtk_widget_get_window(gui.mainwin); GdkWindow * const mainwin_win = gtk_widget_get_window(gui.mainwin);

11
src/gui_x11.c
View File

@ -1363,20 +1363,9 @@ gui_mch_init(void)
#else #else
// Use Pixmaps, looking much nicer. // 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" # include "../runtime/vim32x32.xpm"
# undef magick
# define magick vim16x16
# include "../runtime/vim16x16.xpm" # include "../runtime/vim16x16.xpm"
# undef magick
# define magick vim48x48
# include "../runtime/vim48x48.xpm" # include "../runtime/vim48x48.xpm"
# undef magick
static Pixmap icon = 0; static Pixmap icon = 0;
static Pixmap icon_mask = 0; static Pixmap icon_mask = 0;

2
src/version.c
View File

@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
432,
/**/ /**/
431, 431,
/**/ /**/