(no commit message)

diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h
index 4621d7636667af49ea18cc0109f8d5e83d5a58ff..3fe852d869d93821c89249c3c317256f8c05efcb 100644 (file)
--- a/MagickCore/MagickCore.h
+++ b/MagickCore/MagickCore.h
@@ -44,6 +44,14 @@ extern "C" {
 # endif
 #endif
 
+#define MAGICKCORE_CHECK_VERSION(major,minor,micro) \
+  ((MAGICKCORE_MAJOR_VERSION > (major)) || \
+    ((MAGICKCORE_MAJOR_VERSION == (major)) && \
+     (MAGICKCORE_MINOR_VERSION > (minor))) || \
+    ((MAGICKCORE_MAJOR_VERSION == (major)) && \
+     (MAGICKCORE_MINOR_VERSION == (minor)) && \
+     (MAGICKCORE_MICRO_VERSION >= (micro))))
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>

diff --git a/MagickWand/MagickWand.h b/MagickWand/MagickWand.h
index b6c7747d48f392b9337c7c548108c51578fbaf11..0c61248c1ba194750097d0433a86c6ee2d7ea039 100644 (file)
--- a/MagickWand/MagickWand.h
+++ b/MagickWand/MagickWand.h
@@ -44,6 +44,14 @@ extern "C" {
 # endif
 #endif
 
+#define MAGICKWAND_CHECK_VERSION(major,minor,micro) \
+  ((MAGICKWAND_MAJOR_VERSION > (major)) || \
+    ((MAGICKWAND_MAJOR_VERSION == (major)) && \
+     (MAGICKWAND_MINOR_VERSION > (minor))) || \
+    ((MAGICKWAND_MAJOR_VERSION == (major)) && \
+     (MAGICKWAND_MINOR_VERSION == (minor)) && \
+     (MAGICKWAND_MICRO_VERSION >= (micro))))
+
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
@@ -51,9 +59,9 @@ extern "C" {
 #include <sys/types.h>
 
 #if defined(WIN32) || defined(WIN64)
-#  define MAGICKCORE_WINDOWS_SUPPORT
+#  define MAGICKWAND_WINDOWS_SUPPORT
 #else
-#  define MAGICKCORE_POSIX_SUPPORT
+#  define MAGICKWAND_POSIX_SUPPORT
 #endif 
 
 #if defined(__BORLANDC__) && defined(_DLL)
@@ -64,7 +72,7 @@ extern "C" {
 
 #include "MagickWand/method-attribute.h"
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
+#if defined(MAGICKWAND_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
 # define WandPrivate
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
 #  define _MAGICKDLL_

diff --git a/coders/svg.c b/coders/svg.c
index b13881f670879b45ac20b214dca352afcb317398..f574fdee3c34d840b8c288ac15bcba352de540b2 100644 (file)
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -3215,7 +3215,9 @@ ModuleExport size_t RegisterSVGImage(void)
   (void) CopyMagickString(version,"XML " LIBXML_DOTTED_VERSION,MaxTextExtent);
 #endif
 #if defined(MAGICKCORE_RSVG_DELEGATE)
+#if !GLIB_CHECK_VERSION(2,5,0)
   g_type_init();
+#endif
   (void) FormatLocaleString(version,MaxTextExtent,"RSVG %d.%d.%d",
     LIBRSVG_MAJOR_VERSION,LIBRSVG_MINOR_VERSION,LIBRSVG_MICRO_VERSION);
 #endif