Merge branch 'PHP-5.6' into PHP-7.0

laruence · laruence · commit 64a90a6b985b · 2015-11-20T15:36:26.000+08:00
diff --git a/ext/gd/gd_compat.c b/ext/gd/gd_compat.c
@@ -1,7 +1,7 @@
-#include "php_config.h"
-
 #ifdef HAVE_CONFIG_H
 #include "config.h"
+#else
+#include "php_config.h"
 #endif
 
 #ifdef HAVE_GD_PNG
