fix C89 compat
Merge branch 'PHP-5.5'

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