thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

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
6 changed files with 5 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/gui_x11.c
View File

@@ -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;