From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 10 May 2016 14:53:43 +0000 (+0300)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~167
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=13ea0869454b855a2cdcaf36eaa127ddb7c7c010;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  The "flock" structure has to be writable on AIX.
---

13ea0869454b855a2cdcaf36eaa127ddb7c7c010