diff options
| author | Jason Rumney <jasonr@gnu.org> | 2004-05-05 23:21:55 +0000 |
|---|---|---|
| committer | Jason Rumney <jasonr@gnu.org> | 2004-05-05 23:21:55 +0000 |
| commit | 42e11299362bf85e1d513d714fbf4531421aba58 (patch) | |
| tree | 53a809d0f403d5819b7b57d559548a95b8fe1fd5 | |
| parent | cfcac14125a6f310e5232f520129c1d28f920fc4 (diff) | |
| download | emacs-42e11299362bf85e1d513d714fbf4531421aba58.tar.gz | |
(Display) [HAVE_NTGUI]: Redefine while loading xpm.h to avoid name clash.
| -rw-r--r-- | src/image.c | 3 |
1 files changed, 3 insertions, 0 deletions
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" |