aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-07 05:54:16 -04:00
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

14
src/gui_gtk_x11.c
View File

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