(no commit message)

[imagemagick] / MagickWand / MagickWand.h

diff --git a/MagickWand/MagickWand.h b/MagickWand/MagickWand.h
index aca44fdcc8b7fcefae8fb1798ee0d2616c598684..0be1f21fa945f63abec0a333515a7e1ce630c956 100644 (file)
--- a/MagickWand/MagickWand.h
+++ b/MagickWand/MagickWand.h
@@ -16,8 +16,8 @@
   MagickWand Application Programming Interface declarations.
 */
 
-#ifndef _MAGICK_WAND_H
-#define _MAGICK_WAND_H
+#ifndef _MAGICKWAND_MAGICKWAND_H
+#define _MAGICKWAND_MAGICKWAND_H
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -61,6 +61,8 @@ extern "C" {
 #  define _MAGICKLIB_
 #endif
 
+#include "MagickWand/method-attribute.h"
+
 #if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__)
 # define WandPrivate
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
@@ -116,11 +118,6 @@ extern "C" {
 # define WandGlobal
 #endif
 
-#if !defined(MaxTextExtent)
-# define MaxTextExtent  4096
-#endif
-#define WandSignature  0xabacadabUL
-
 #if defined(MAGICKCORE_HAVE___ATTRIBUTE__)
 #  define wand_aligned(x)  __attribute__((__aligned__(x)))
 #  define wand_attribute  __attribute__