Mercurial > emacs
changeset 55375:b9215c2d57ad
(Display) [HAVE_NTGUI]: Redefine while loading xpm.h to avoid name clash.
| author | Jason Rumney <jasonr@gnu.org> |
|---|---|
| date | Wed, 05 May 2004 23:21:55 +0000 |
| parents | 8f731442b8fb |
| children | 929f51db2b0b |
| files | src/image.c |
| diffstat | 1 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/image.c Wed May 05 12:14:39 2004 +0000 +++ b/src/image.c Wed May 05 23:21:55 2004 +0000 @@ -3179,13 +3179,16 @@ /* 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"