From 3022edd060cef498b957dde02ed38617cc01226b Mon Sep 17 00:00:00 2001 From: Doug Torrance Date: Sat, 18 Apr 2020 23:00:34 -0400 Subject: [PATCH] wrlib: Fix typo in macro containing ImageMagick version It's USE_MAGICK, not USE_MAGIC. Also, we wrap the if/else statement in an ifdef. This doesn't really affect anything since load_magick.c won't be compiled if USE_MAGICK is undefined because of an if statement in the Makefile. But in the off chance that it is somehow, then we will try to load a nonexistent version 6 header file since USE_MAGICK will be interprested as 0 and 0 < 7 is true. --- wrlib/load_magick.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wrlib/load_magick.c b/wrlib/load_magick.c index dbbfe92d..876db903 100644 --- a/wrlib/load_magick.c +++ b/wrlib/load_magick.c @@ -22,11 +22,13 @@ #include "config.h" -#if USE_MAGIC < 7 +#ifdef USE_MAGICK +#if USE_MAGICK < 7 #include #else #include #endif +#endif #include "wraster.h" #include "imgformat.h"