From: Dmitry Stogov <dmitry@zend.com>
Date: Wed, 13 May 2015 07:10:14 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~42^2~94
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d3a24c3f790891d507e8367808c2a4a729498f9;p=php

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

* 'master' of git.php.net:php-src:
  fix build, catch up with linux part for #66048
---

0d3a24c3f790891d507e8367808c2a4a729498f9