From: Remi Collet <remi@php.net>
Date: Tue, 4 Jul 2017 18:26:53 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.8RC1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1fa8e74d6eebaa19174ea56581f23b13e6b77000;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Adapt for 32-bits which fails at different offset (49 vs 38)
---

1fa8e74d6eebaa19174ea56581f23b13e6b77000