martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(Display) [HAVE_NTGUI]: Redefine while loading xpm.h to avoid name clash.

Browse Source
This commit is contained in:
Jason Rumney
2004-05-05 23:22:41 +00:00
parent 971cb8347a
commit 279d3293d3
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog
View File

@@ -1,3 +1,8 @@
2004-05-06 Jason Rumney <jasonr@gnu.org>
* image.c (Display) [HAVE_NTGUI]: Redefine while loading xpm.h
to avoid name clash.
2004-05-04 Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
* fileio.c (barf_or_query_if_file_exists): Use lstat.

3
src/image.c
View File

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