From: Xinchen Hui Date: Fri, 20 Nov 2015 07:22:59 +0000 (+0800) Subject: Merge branch 'PHP-7.0' X-Git-Tag: php-7.1.0alpha1~705^2~59 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a50a96f465b714434626dcf7d5a9fcc3134ff76;p=php Merge branch 'PHP-7.0' --- 8a50a96f465b714434626dcf7d5a9fcc3134ff76 diff --cc ext/gd/gd_compat.c index af55e42d9a,aedc9b302a..79862bf75f --- a/ext/gd/gd_compat.c +++ b/ext/gd/gd_compat.c @@@ -1,4 -1,6 +1,8 @@@ -#include "php_config.h" +#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif + + #ifdef HAVE_CONFIG_H #include "config.h" #endif