From: Joe Watkins <krakjoe@php.net>
Date: Mon, 10 Apr 2017 07:07:52 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' of git.php.net:/php-src into PHP-7.1
X-Git-Tag: php-7.1.5RC1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=68b312db7d2a60c8cb6faec38c850370c169079e;p=php

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

* 'PHP-7.1' of git.php.net:/php-src:
  Fixed condition check
  Fixed condition check
  another place
  Fixed issue #2466 Invalid integer constant expression error in php.h
---

68b312db7d2a60c8cb6faec38c850370c169079e