From: Remi Collet <remi@php.net>
Date: Tue, 4 Jul 2017 18:27:10 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0beta1~151
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1be05630873afd716376dd92bd70e48ee75e37b0;p=php

Merge branch 'PHP-7.1'

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

1be05630873afd716376dd92bd70e48ee75e37b0