These dont need to be defined in global header

Imagick · Sep 30, 2013 · bcd5a9b · bcd5a9b
1 parent 8a65038
commit bcd5a9b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/php_imagick.h b/php_imagick.h
@@ -44,25 +44,6 @@
 # include <locale.h>
 #endif
 
-/* Include magic wand header */
-#ifdef IMAGICK_USE_NEW_HEADER
-#  include <wand/MagickWand.h>
-#else
-#  include <wand/magick-wand.h>
-#endif
-
-#ifndef DefaultChannels
-# define DefaultChannels (AllChannels &~ OpacityChannel)
-#endif
-
-/* Some extra headers */
-#include "Zend/zend_exceptions.h"
-#include "Zend/zend_interfaces.h"
-#include "ext/standard/php_string.h"
-#include "ext/standard/info.h"
-#include "ext/standard/php_filestat.h"
-#include "php_ini.h"
-
 /* Define the entry point symbol
  * Zend will use when loading this module
  */

diff --git a/php_imagick_defs.h b/php_imagick_defs.h
@@ -20,6 +20,25 @@
 #ifndef PHP_IMAGICK_DEFS_H /* PHP_IMAGICK_DEFS_H */
 # define PHP_IMAGICK_DEFS_H
 
+/* Include magic wand header */
+#ifdef IMAGICK_USE_NEW_HEADER
+#  include <wand/MagickWand.h>
+#else
+#  include <wand/magick-wand.h>
+#endif
+
+#ifndef DefaultChannels
+# define DefaultChannels (AllChannels &~ OpacityChannel)
+#endif
+
+/* Some extra headers */
+#include "Zend/zend_exceptions.h"
+#include "Zend/zend_interfaces.h"
+#include "ext/standard/php_string.h"
+#include "ext/standard/info.h"
+#include "ext/standard/php_filestat.h"
+#include "php_ini.h"
+
 /*
 	API exports
 */