Merge branch 'PHP-5.6' into PHP-7.0

laruence · weltling · commit 0c9bb33c2cfd · 2015-11-19T19:23:35.000+01:00
diff --git a/ext/gd/gd_compat.c b/ext/gd/gd_compat.c
@@ -1,5 +1,9 @@
 #include "php_config.h"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #ifdef HAVE_GD_PNG
 /* needs to be first */
 # include <png.h>
