fix C90 compat
Merge branch 'PHP-5.4' into PHP-5.5

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