# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1083799315 0
# Node ID b9215c2d57add99e2c88ea409b6dd2e15cd7dab2
# Parent  8f731442b8fb02cc9844f742cb1e0aadea1f97ea
(Display) [HAVE_NTGUI]: Redefine while loading xpm.h to avoid name clash.

diff -r 8f731442b8fb -r b9215c2d57ad src/image.c
--- 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"