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:24:06 +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-89939@lists.php.net to get a copy of this message
Commit: 01b88f87ba3638297f0f9afb2352c3acdeb18e42 Author: Xinchen Hui <laruence@gmail.com> Fri, 20 Nov 2015 15:36:26 +0800 Committer: Anatol Belski <ab@php.net> Thu, 19 Nov 2015 19:24:06 +0100 Parents: 0c9bb33c2cfd38765955f888c2eb78fae5ecf1ce Branches: PHP-7.0.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=01b88f87ba3638297f0f9afb2352c3acdeb18e42 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 aedc9b3..51020a3 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

« previous php.cvs (#89939) next »