From: Joe Watkins <krakjoe@php.net>
Date: Mon, 10 Apr 2017 07:06:52 +0000 (+0100)
Subject: Merge branch 'master' of git.php.net:/php-src
X-Git-Tag: php-7.2.0alpha1~145
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e24dcf97f1af7165d14ff3f57f21c7c89225e1f7;p=php

Merge branch 'master' of git.php.net:/php-src

* 'master' 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
---

e24dcf97f1af7165d14ff3f57f21c7c89225e1f7