diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/image.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/image.c b/src/image.c index 38866e08345..657852b1a80 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -3159,16 +3159,18 @@ static bool xpm_load (struct frame *f, struct image *img); | |||
| 3159 | #define XColor xpm_XColor | 3159 | #define XColor xpm_XColor |
| 3160 | #define XImage xpm_XImage | 3160 | #define XImage xpm_XImage |
| 3161 | #define Display xpm_Display | 3161 | #define Display xpm_Display |
| 3162 | #define PIXEL_ALREADY_TYPEDEFED | 3162 | #ifdef CYGWIN |
| 3163 | #include "noX/xpm.h" | ||
| 3164 | #else /* not CYGWIN */ | ||
| 3163 | #include "X11/xpm.h" | 3165 | #include "X11/xpm.h" |
| 3166 | #endif /* not CYGWIN */ | ||
| 3164 | #undef FOR_MSW | 3167 | #undef FOR_MSW |
| 3165 | #undef XColor | 3168 | #undef XColor |
| 3166 | #undef XImage | 3169 | #undef XImage |
| 3167 | #undef Display | 3170 | #undef Display |
| 3168 | #undef PIXEL_ALREADY_TYPEDEFED | 3171 | #else /* not HAVE_NTGUI */ |
| 3169 | #else | ||
| 3170 | #include "X11/xpm.h" | 3172 | #include "X11/xpm.h" |
| 3171 | #endif /* HAVE_NTGUI */ | 3173 | #endif /* not HAVE_NTGUI */ |
| 3172 | #endif /* HAVE_XPM */ | 3174 | #endif /* HAVE_XPM */ |
| 3173 | 3175 | ||
| 3174 | #if defined (HAVE_XPM) || defined (HAVE_NS) | 3176 | #if defined (HAVE_XPM) || defined (HAVE_NS) |