]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Fri, 21 Jul 2017 10:16:37 +0000 (18:16 +0800)
committerXinchen Hui <laruence@gmail.com>
Fri, 21 Jul 2017 10:16:37 +0000 (18:16 +0800)
* 'PHP-7.0' of git.php.net:/php-src:
  Move the define into the header to reduce diff for future upgrade


Trivial merge