From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 14 Jan 2014 21:51:01 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~2874
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7694fb099bf0055f25d62cb5429984e7593d0ae8;p=imagemagick

---

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 93aeccbce..3bcd4e2ea 100644
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -56,12 +56,6 @@
 /*
   Define declarations.
 */
-#define ThrowWandException(severity,tag,context) \
-{ \
-  (void) ThrowMagickException(wand->exception,GetMagickModule(),severity, \
-    tag,"`%s'",context); \
-  return(MagickFalse); \
-}
 #define MagickWandId  "MagickWand"
 
 /*
diff --git a/MagickWand/magick-property.c b/MagickWand/magick-property.c
index 6ea87d869..08be0230d 100644
--- a/MagickWand/magick-property.c
+++ b/MagickWand/magick-property.c
@@ -52,16 +52,6 @@
 #include "MagickWand/wand.h"
 #include "MagickCore/string-private.h"
 
-/*
-  Define declarations.
-*/
-#define ThrowWandException(severity,tag,context) \
-{ \
-  (void) ThrowMagickException(wand->exception,GetMagickModule(),severity, \
-    tag,"`%s'",context); \
-  return(MagickFalse); \
-}
-
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %
diff --git a/MagickWand/magick-wand-private.h b/MagickWand/magick-wand-private.h
index e1c3d4e70..55587fb32 100644
--- a/MagickWand/magick-wand-private.h
+++ b/MagickWand/magick-wand-private.h
@@ -26,6 +26,12 @@ extern "C" {
 #define QuantumTick(i,span) ((MagickBooleanType) ((((i) & ((i)-1)) == 0) || \
    (((i) & 0xfff) == 0) || \
    ((MagickOffsetType) (i) == ((MagickOffsetType) (span)-1))))
+#define ThrowWandException(severity,tag,context) \
+{ \
+  (void) ThrowMagickException(wand->exception,GetMagickModule(),severity, \
+    tag,"`%s'",context); \
+  return(MagickFalse); \
+}
 #define ThrowWandFatalException(severity,tag,context) \
 { \
   ExceptionInfo \
diff --git a/MagickWand/magick-wand.c b/MagickWand/magick-wand.c
index 022bb1d2c..4d14d177c 100644
--- a/MagickWand/magick-wand.c
+++ b/MagickWand/magick-wand.c
@@ -51,16 +51,6 @@
 #include "MagickWand/magick-wand-private.h"
 #include "MagickWand/wand.h"
 
-/*
-  Define declarations.
-*/
-#define ThrowWandException(severity,tag,context) \
-{ \
-  (void) ThrowMagickException(wand->exception,GetMagickModule(),severity, \
-    tag,"`%s'",context); \
-  return(MagickFalse); \
-}
-
 /*
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %                                                                             %