From: Xinchen Hui <laruence@gmail.com>
Date: Fri, 21 Jul 2017 10:16:37 +0000 (+0800)
Subject: Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
X-Git-Tag: php-7.0.23RC1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=256ec5bebb04d9fdea55951d8bb26eed659adf66;p=php

Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0

* 'PHP-7.0' of git.php.net:/php-src:
  Move the define into the header to reduce diff for future upgrade
---

256ec5bebb04d9fdea55951d8bb26eed659adf66