summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2015-11-20 15:22:45 +0800
committerXinchen Hui <laruence@gmail.com>2015-11-20 15:22:45 +0800
commit7e68d6e73505c62efef55d66e763467c30cd76d2 (patch)
treed59b132a103c1d4f75589c0b5ea3adb62856d7b5
parentf66e25a82b4cccb7b3b15ebc8e59e3695b02ddc6 (diff)
parentc8d6673b597f71cbbb04977ff87e6d45907484c2 (diff)
downloadphp-git-7e68d6e73505c62efef55d66e763467c30cd76d2.tar.gz
Merge branch 'PHP-5.6' into PHP-7.0
-rw-r--r--ext/gd/gd_compat.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/gd/gd_compat.c b/ext/gd/gd_compat.c
index d6d8d0b2f9..aedc9b302a 100644
--- 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>