From: Joe Watkins <krakjoe@php.net>
Date: Mon, 10 Apr 2017 07:07:24 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
X-Git-Tag: php-7.0.19RC1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e6423757645749dca781639d815f8348a4a20c98;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:
  Fixed condition check
  Fixed issue #2466 Invalid integer constant expression error in php.h
---

e6423757645749dca781639d815f8348a4a20c98