fix C89 compat
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5