fixed incompatible pointer in phpdbg on win64
5.4.25 next
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.25 next

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.25 next
Fix test
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
brought the ext/sybase_ct/config.w32 up to date
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  brought the ext/sybase_ct/config.w32 up to date
fix c89 compat
Fixed ZEND_MM_MEM_TYPE=mmap_zero
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed ZEND_MM_MEM_TYPE=mmap_zero

Conflicts:
	NEWS
Improved empty string handling. Now ZE uses an interned string instead of allocation new empty string each time. (Some extensions might need to be fixed using str_efree() instead of efree() to support interned strings).