com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/gd/gd_c ompat.c

From: Date: Thu, 19 Nov 2015 18:23:35 +0000
Subject: com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/gd/gd_c ompat.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-89938@lists.php.net to get a copy of this message
Commit: 0c9bb33c2cfd38765955f888c2eb78fae5ecf1ce Author: Xinchen Hui <laruence@gmail.com> Fri, 20 Nov 2015 15:22:45 +0800 Committer: Anatol Belski <ab@php.net> Thu, 19 Nov 2015 19:23:35 +0100 Parents: da8d01316c1384840628e38f048a18263e546799 Branches: PHP-7.0.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0c9bb33c2cfd38765955f888c2eb78fae5ecf1ce Log: Merge branch 'PHP-5.6' into PHP-7..0 Changed paths: M ext/gd/gd_compat.c Diff: diff --git a/ext/gd/gd_compat.c b/ext/gd/gd_compat.c index d6d8d0b..aedc9b3 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>

« previous php.cvs (#89938) next »