mirror of
https://github.com/vim/vim
synced 2025-07-16 01:01:58 +00:00
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>
This commit is contained in:
committed by
Christian Brabandt
parent
802fc04a78
commit
5090f838bb
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * vim16x16[] = {
|
||||
static const char * vim16x16[] = {
|
||||
"16 16 8 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * vim32x32[] = {
|
||||
static const char * vim32x32[] = {
|
||||
"32 32 8 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
|
@ -1,5 +1,5 @@
|
||||
/* XPM */
|
||||
static char * vim48x48[] = {
|
||||
static const char * vim48x48[] = {
|
||||
"48 48 8 1",
|
||||
" c None",
|
||||
". c #000000",
|
||||
|
@ -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);
|
||||
|
||||
|
@ -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;
|
||||
|
@ -704,6 +704,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
432,
|
||||
/**/
|
||||
431,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user