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

Merge branch 'PHP-7.2'

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

821bdbdfba3d45066b45d506d62b4fb6ab44287b