diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-08-27 22:03:25 -0400 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-08-27 22:03:42 -0400 |
| commit | bf1b147b55e1328efca6e40181e79dd9a369895d (patch) | |
| tree | 61a9edcb1ec54021e3049cd0695e4106b7c677f5 /src/image.c | |
| parent | 5729486951e6a60db55ea17ee3bac9baf8b54f6a (diff) | |
| download | emacs-bf1b147b55e1328efca6e40181e79dd9a369895d.tar.gz emacs-bf1b147b55e1328efca6e40181e79dd9a369895d.tar.bz2 emacs-bf1b147b55e1328efca6e40181e79dd9a369895d.zip | |
* configure.ac, src/image.c: Tweak previous ImageMagick change.
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/image.c b/src/image.c index 7e518ce34f8..36a909ba053 100644 --- a/src/image.c +++ b/src/image.c @@ -8274,15 +8274,15 @@ imagemagick_image_p (Lisp_Object object) Therefore rename the function so it doesn't collide with ImageMagick. */ #define DrawRectangle DrawRectangleGif -#if IMAGEMAGICK_MAJOR == 6 -# include <wand/MagickWand.h> -# include <magick/version.h> -#else +#ifdef HAVE_IMAGEMAGICK7 # include <MagickWand/MagickWand.h> # include <MagickCore/version.h> -/* ImageMagick 7 compatibility definitions */ +/* ImageMagick 7 compatibility definitions. */ # define PixelSetMagickColor PixelSetPixelColor typedef PixelInfo MagickPixelPacket; +#else +# include <wand/MagickWand.h> +# include <magick/version.h> #endif /* ImageMagick 6.5.3 through 6.6.5 hid PixelGetMagickColor for some reason. |