From: Remi Collet <remi@php.net>
Date: Wed, 16 Mar 2016 06:18:23 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~474^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d45f478454c846adf15fa44d7c026e8b702694d2;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  fix #ifdef usage
---

d45f478454c846adf15fa44d7c026e8b702694d2