diff options
| author | Xinchen Hui <laruence@gmail.com> | 2015-11-20 15:36:26 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2015-11-20 15:36:26 +0800 |
| commit | 64a90a6b985be72ae0961ae0aa05b158b3586d9f (patch) | |
| tree | c0807c9266b988497057cfc888158dfdd97ae247 | |
| parent | 7e68d6e73505c62efef55d66e763467c30cd76d2 (diff) | |
| parent | b42eb16cf4ae58e8c8fbc8afc4406bc746497754 (diff) | |
| download | php-git-64a90a6b985be72ae0961ae0aa05b158b3586d9f.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
| -rw-r--r-- | ext/gd/gd_compat.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/gd/gd_compat.c b/ext/gd/gd_compat.c index aedc9b302a..51020a3c71 100644 --- 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 |