C89 compat
Merge remote-tracking branch 'phpdbg/master' into PHP-5.6

* phpdbg/master:
  C89 compat
Merge branch 'PHP-5.6'

* PHP-5.6:
  C89 compat
Merge branch 'master' of git://github.com/php/php-src