From 279d3293d3f011dac5965b0da2d32a3a04eccb7a Mon Sep 17 00:00:00 2001 From: Jason Rumney Date: Wed, 5 May 2004 23:22:41 +0000 Subject: [PATCH] (Display) [HAVE_NTGUI]: Redefine while loading xpm.h to avoid name clash. --- src/ChangeLog | 5 +++++ src/image.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index 035aa78c24f..e71edf8239e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2004-05-06 Jason Rumney + + * image.c (Display) [HAVE_NTGUI]: Redefine while loading xpm.h + to avoid name clash. + 2004-05-04 Jan Dj,Ad(Brv * fileio.c (barf_or_query_if_file_exists): Use lstat. diff --git a/src/image.c b/src/image.c index 4c2bdb440e8..09e497576a4 100644 --- a/src/image.c +++ b/src/image.c @@ -3179,13 +3179,16 @@ static int xpm_valid_color_symbols_p P_ ((Lisp_Object)); /* Indicate to xpm.h that we don't have Xlib. */ #define FOR_MSW /* simx.h in xpm defines XColor and XImage differently than Emacs. */ +/* It also defines Display the same way as Emacs, but gcc 3.3 still barfs. */ #define XColor xpm_XColor #define XImage xpm_XImage +#define Display xpm_Display #define PIXEL_ALREADY_TYPEDEFED #include "X11/xpm.h" #undef FOR_MSW #undef XColor #undef XImage +#undef Display #undef PIXEL_ALREADY_TYPEDEFED #else #include "X11/xpm.h" -- 2.39.2