diff options
| author | Anatol Belski <ab@php.net> | 2014-04-24 10:53:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-24 10:53:31 +0200 |
| commit | 60f976a45e67f5d7630b8ddb12e89d22d27f5e1f (patch) | |
| tree | 9b4e9bc1ac171365b93f314df34cf20a6af52046 /main/php_variables.c | |
| parent | c0c452d1e0aaf042d269c21aebb7b6ed9ab5ce2a (diff) | |
| parent | 9280e255347dc5afd235afa760920cc48eb37801 (diff) | |
| download | php-git-60f976a45e67f5d7630b8ddb12e89d22d27f5e1f.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
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 cf8cdcfb86..fef905ff7d 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); |