diff options
| author | Anatol Belski <ab@php.net> | 2014-04-24 10:52:22 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-04-24 10:52:22 +0200 |
| commit | acfed1c4c71f25603e90f9df3930c294e5ae0726 (patch) | |
| tree | 0b16c53aa476233e9aa6662dbf7be2b746853b4b | |
| parent | aca526a13b8fa9b3444906a18c3e20a7d2672d94 (diff) | |
| parent | 03be983398b75fdc147406e73a5d0dddd4533c08 (diff) | |
| download | php-git-acfed1c4c71f25603e90f9df3930c294e5ae0726.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix dll export
| -rw-r--r-- | main/php_variables.c | 2 | ||||
| -rw-r--r-- | main/php_variables.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/main/php_variables.c b/main/php_variables.c index 01be8ca7e3..d751ef5d5d 100644 --- a/main/php_variables.c +++ b/main/php_variables.c @@ -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); diff --git a/main/php_variables.h b/main/php_variables.h index 37b2cf2a04..2331c582e6 100644 --- a/main/php_variables.h +++ b/main/php_variables.h @@ -41,7 +41,7 @@ PHPAPI void php_register_variable(char *var, char *val, zval *track_vars_array T PHPAPI void php_register_variable_safe(char *var, char *val, int val_len, zval *track_vars_array TSRMLS_DC); PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_array TSRMLS_DC); -int php_hash_environment(TSRMLS_D); +PHPAPI int php_hash_environment(TSRMLS_D); END_EXTERN_C() #define NUM_TRACK_VARS 6 |