From: Anatol Belski <ab@php.net>
Date: Thu, 30 Nov 2017 11:41:44 +0000 (+0100)
Subject: Merge branch 'PHP-7.2'
X-Git-Tag: php-7.3.0alpha1~909
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a415006b5e9735dc9e731816ca0ef18e26402fdf;p=php

Merge branch 'PHP-7.2'

* PHP-7.2:
  Fix macro redefinition warnings
---

a415006b5e9735dc9e731816ca0ef18e26402fdf