diff options
| author | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
|---|---|---|
| committer | Jakub Zelenka <bukka@php.net> | 2014-12-27 19:42:04 +0000 |
| commit | b68da91d52801fb2cc4d2a4a44c859ea5b6c622b (patch) | |
| tree | 290f7c8ea7fd2df02c995b07c1d490c2de333db5 /main/php_variables.h | |
| parent | 4f6539bdaf62f0343f4ec67638d2f96e8c1c00ae (diff) | |
| parent | a9e86957c70c181e830ba05bb030c468d0cb15e1 (diff) | |
| download | php-git-b68da91d52801fb2cc4d2a4a44c859ea5b6c622b.tar.gz | |
Merge branch 'master' into jsond
Conflicts:
ext/json/JSON_parser.c
ext/json/JSON_parser.h
ext/json/config.m4
ext/json/config.w32
ext/json/json.c
ext/json/php_json.h
Diffstat (limited to 'main/php_variables.h')
| -rw-r--r-- | main/php_variables.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/php_variables.h b/main/php_variables.h index 08abeb5267..6c9ceaa277 100644 --- a/main/php_variables.h +++ b/main/php_variables.h @@ -34,14 +34,14 @@ #define PARSE_SESSION 6 BEGIN_EXTERN_C() -void php_startup_auto_globals(TSRMLS_D); -extern PHPAPI void (*php_import_environment_variables)(zval *array_ptr TSRMLS_DC); -PHPAPI void php_register_variable(char *var, char *val, zval *track_vars_array TSRMLS_DC); +void php_startup_auto_globals(void); +extern PHPAPI void (*php_import_environment_variables)(zval *array_ptr); +PHPAPI void php_register_variable(char *var, char *val, zval *track_vars_array); /* binary-safe version */ -PHPAPI void php_register_variable_safe(char *var, char *val, size_t val_len, zval *track_vars_array TSRMLS_DC); -PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_array TSRMLS_DC); +PHPAPI void php_register_variable_safe(char *var, char *val, size_t val_len, zval *track_vars_array); +PHPAPI void php_register_variable_ex(char *var, zval *val, zval *track_vars_array); -PHPAPI int php_hash_environment(TSRMLS_D); +PHPAPI int php_hash_environment(void); END_EXTERN_C() #define NUM_TRACK_VARS 6 |