Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix dll export
This commit is contained in:
Anatol Belski 2014-04-24 10:52:22 +02:00
commit acfed1c4c7
2 changed files with 2 additions and 2 deletions

View file

@ -619,7 +619,7 @@ static zend_bool php_auto_globals_create_request(const char *name, uint name_len
/* {{{ php_hash_environment
*/
int php_hash_environment(TSRMLS_D)
PHPAPI int php_hash_environment(TSRMLS_D)
{
memset(PG(http_globals), 0, sizeof(PG(http_globals)));
zend_activate_auto_globals(TSRMLS_C);