summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2015-11-20 15:22:45 +0800
committerAnatol Belski <ab@php.net>2015-11-19 19:23:35 +0100
commit0c9bb33c2cfd38765955f888c2eb78fae5ecf1ce (patch)
tree740fa5b68e6e7cd1f58af26e972f33fdc0023314
parentda8d01316c1384840628e38f048a18263e546799 (diff)
downloadphp-git-0c9bb33c2cfd38765955f888c2eb78fae5ecf1ce.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>