Moved object defs out of magical header file

Author: marandall

ext/gd/gd.c

@@ -56,8 +56,8 @@
 #endif
 
 
-# include "gd_compat.h"
-
+#include "gd_compat.h"
+#include "gd_image_object.h"
 
 static int le_gd, le_gd_font;
 

ext/gd/gd_ctx.c

@@ -17,6 +17,7 @@
  */
 
 #include "php_gd.h"
+#include "gd_image_object.h"
 
 #define CTX_PUTC(c,ctx) ctx->putC(ctx, c)
 

ext/gd/gd_image_object.h

@@ -0,0 +1,37 @@
+/*
+   +----------------------------------------------------------------------+
+   | PHP Version 7                                                        |
+   +----------------------------------------------------------------------+
+   | Copyright (c) The PHP Group                                          |
+   +----------------------------------------------------------------------+
+   | This source file is subject to version 3.01 of the PHP license,      |
+   | that is bundled with this package in the file LICENSE, and is        |
+   | available through the world-wide-web at the following url:           |
+   | http://www.php.net/license/3_01.txt                                  |
+   | If you did not receive a copy of the PHP license and are unable to   |
+   | obtain it through the world-wide-web, please send a note to          |
+   | [email protected] so we can mail you a copy immediately.               |
+   +----------------------------------------------------------------------+
+   | Authors: Mark Randall <[email protected]>                            |
+   +----------------------------------------------------------------------+
+ */
+
+#ifndef SRC_GD_IMAGE_OBJECT_H
+#define SRC_GD_IMAGE_OBJECT_H
+
+#include <php.h>
+#include <gd.h>
+
+zend_class_entry *gd_image_ce;
+
+#define GD_IMAGE_PTR_FROM_ZVAL_P(x) (((gd_ext_image_object*)Z_OBJ_P(x))->image)
+
+static zend_object* gd_ext_image_object_init(zval* val, gdImagePtr image);
+
+typedef struct _gd_ext_image_object {
+    zend_object std;
+    gdImagePtr image;
+} gd_ext_image_object;
+
+
+#endif //SRC_GD_IMAGE_OBJECT_H

ext/gd/php_gd.h

@@ -22,19 +22,6 @@
 
 #if defined(HAVE_LIBGD) || defined(HAVE_GD_BUNDLED)
 
-#include <gd.h>
-
-zend_class_entry *gd_image_ce;
-
-#define GD_IMAGE_PTR_FROM_ZVAL_P(x) (((gd_ext_image_object*)Z_OBJ_P(x))->image)
-
-static zend_object* gd_ext_image_object_init(zval* val, gdImagePtr image);
-
-typedef struct _gd_ext_image_object {
-	zend_object std;
-	gdImagePtr image;
-} gd_ext_image_object;
-
 /* open_basedir and safe_mode checks */
 #define PHP_GD_CHECK_OPEN_BASEDIR(filename, errormsg)                       \
 	if (!filename || php_check_open_basedir(filename)) {      \