This is an automated email from the ASF dual-hosted git repository.

cmcfarlen pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit e99f2b1c93974aed6f39c20a7c275a6a1016c155
Author: Chris McFarlen <[email protected]>
AuthorDate: Wed Jul 10 10:27:43 2024 -0500

    Fix for imagemagick 7 (#11528)
    
    Co-authored-by: Chris McFarlen <[email protected]>
    (cherry picked from commit e274dd1e076effc5ea9fc2eb51f549c6f5820448)
---
 plugins/experimental/magick/magick.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/experimental/magick/magick.cc 
b/plugins/experimental/magick/magick.cc
index 968b0b1889..0adf80ac5a 100644
--- a/plugins/experimental/magick/magick.cc
+++ b/plugins/experimental/magick/magick.cc
@@ -40,7 +40,7 @@
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 
-#if MAGICK_VERSION > 6
+#if __has_include(<MagickWand/MagickWand.h>)
 #if defined(__GNUC__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wtype-limits"

Reply via email to