Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  added new glob() test
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64503 (Compilation fails with error: conflicting types for 'zendparse').