From: Anatol Belski <ab@php.net>
Date: Tue, 26 Jul 2016 12:59:58 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1558^2~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b9146e17f3fe13bc42bb00b7d2b1e36cc50927c;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  fix missing header and conflicting symbol
  fix compiler warning
  fix data type
---

0b9146e17f3fe13bc42bb00b7d2b1e36cc50927c