diff options
| author | Anatol Belski <ab@php.net> | 2014-04-24 10:52:59 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-24 10:52:59 +0200 |
| commit | 9280e255347dc5afd235afa760920cc48eb37801 (patch) | |
| tree | b4d49b2f63847bf1bf320cb663c10a6716d32aac /main/php_variables.c | |
| parent | ab8065e4ecdbaa59aaf5a37e62be50815af19e53 (diff) | |
| parent | acfed1c4c71f25603e90f9df3930c294e5ae0726 (diff) | |
| download | php-git-9280e255347dc5afd235afa760920cc48eb37801.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
fix dll export
Diffstat (limited to 'main/php_variables.c')
| -rw-r--r-- | main/php_variables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index d1e51b9023..90cfcb20bc 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -694,7 +694,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); |