diff options
| author | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-12-18 10:09:02 +0100 |
| commit | 4b943c9c0dd4114adc78416c5241f11ad5c98a80 (patch) | |
| tree | c9628d91eae3f580f9ebd73d2372e4c9089b2e00 /main/php_ini.h | |
| parent | 79354ba6d0d6a1a4596f9ac66ee9bc3a34ed972b (diff) | |
| parent | dec8eb431adee340fb8dfb9ff33ed29d3279c35f (diff) | |
| download | php-git-POST_NATIVE_TLS_MERGE.tar.gz | |
Merge remote-tracking branch 'origin/native-tls'POST_NATIVE_TLS_MERGE
Diffstat (limited to 'main/php_ini.h')
| -rw-r--r-- | main/php_ini.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/main/php_ini.h b/main/php_ini.h index 7022507f51..235cc68888 100644 --- a/main/php_ini.h +++ b/main/php_ini.h @@ -25,20 +25,20 @@ BEGIN_EXTERN_C() PHPAPI void config_zval_dtor(zval *zvalue); -int php_init_config(TSRMLS_D); +int php_init_config(void); int php_shutdown_config(void); -void php_ini_register_extensions(TSRMLS_D); +void php_ini_register_extensions(void); PHPAPI zval *cfg_get_entry_ex(zend_string *name); PHPAPI zval *cfg_get_entry(const char *name, size_t name_length); PHPAPI int cfg_get_long(const char *varname, zend_long *result); PHPAPI int cfg_get_double(const char *varname, double *result); PHPAPI int cfg_get_string(const char *varname, char **result); -PHPAPI int php_parse_user_ini_file(const char *dirname, char *ini_filename, HashTable *target_hash TSRMLS_DC); -PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, int stage TSRMLS_DC); +PHPAPI int php_parse_user_ini_file(const char *dirname, char *ini_filename, HashTable *target_hash); +PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, int stage); PHPAPI int php_ini_has_per_dir_config(void); PHPAPI int php_ini_has_per_host_config(void); -PHPAPI void php_ini_activate_per_dir_config(char *path, size_t path_len TSRMLS_DC); -PHPAPI void php_ini_activate_per_host_config(const char *host, size_t host_len TSRMLS_DC); +PHPAPI void php_ini_activate_per_dir_config(char *path, size_t path_len); +PHPAPI void php_ini_activate_per_host_config(const char *host, size_t host_len); PHPAPI HashTable* php_ini_get_configuration_hash(void); END_EXTERN_C() |