From: Anatol Belski <ab@php.net>
Date: Thu, 13 Oct 2016 11:09:29 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1143
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d82eac13e8a35fa8b1660386e3c2d47519dff7a;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  fix gettimeofday proto availability
---

1d82eac13e8a35fa8b1660386e3c2d47519dff7a