diff options
| author | Zeev Suraski <zeev@php.net> | 2001-01-05 15:01:15 +0000 |
|---|---|---|
| committer | Zeev Suraski <zeev@php.net> | 2001-01-05 15:01:15 +0000 |
| commit | aae9e7ee5958284efb42e8ac9b328cc0b43a163b (patch) | |
| tree | 9c40bb78683e018a590ac72da3c35e878a682db0 /Zend/zend_ini.c | |
| parent | 5e5c59ebcbc2457721a8ceab74bb41904e221b7a (diff) | |
| download | php-git-aae9e7ee5958284efb42e8ac9b328cc0b43a163b.tar.gz | |
Merge in some ZEND_API additions from Daniel Beulshausen (needed for the
Win32 Apache module)
Diffstat (limited to 'Zend/zend_ini.c')
| -rw-r--r-- | Zend/zend_ini.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Zend/zend_ini.c b/Zend/zend_ini.c index 517b01b58a..9a74fe785e 100644 --- a/Zend/zend_ini.c +++ b/Zend/zend_ini.c @@ -60,7 +60,7 @@ static int zend_restore_ini_entry_cb(zend_ini_entry *ini_entry, int stage) /* * Startup / shutdown */ -int zend_ini_startup(ELS_D) +ZEND_API int zend_ini_startup(ELS_D) { registered_zend_ini_directives = &EG(ini_directives); if (zend_hash_init_ex(registered_zend_ini_directives, 100, NULL, NULL, 1, 0)==FAILURE) { @@ -70,21 +70,21 @@ int zend_ini_startup(ELS_D) } -int zend_ini_shutdown(ELS_D) +ZEND_API int zend_ini_shutdown(ELS_D) { zend_hash_destroy(&EG(ini_directives)); return SUCCESS; } -int zend_ini_deactivate(ELS_D) +ZEND_API int zend_ini_deactivate(ELS_D) { zend_hash_apply_with_argument(&EG(ini_directives), (int (*)(void *, void *)) zend_restore_ini_entry_cb, (void *) ZEND_INI_STAGE_DEACTIVATE); return SUCCESS; } -int zend_copy_ini_directives(ELS_D) +ZEND_API int zend_copy_ini_directives(ELS_D) { zend_ini_entry ini_entry; @@ -117,7 +117,7 @@ static int ini_key_compare(const void *a, const void *b) } -void zend_ini_sort_entries(ELS_D) +ZEND_API void zend_ini_sort_entries(ELS_D) { zend_hash_sort(&EG(ini_directives), qsort, ini_key_compare, 0); } @@ -132,6 +132,7 @@ ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_num zend_ini_entry *hashed_ini_entry; zval *default_value; +#if 0 while (p->name) { p->module_number = module_number; if (zend_hash_add(registered_zend_ini_directives, p->name, p->name_length, p, sizeof(zend_ini_entry), (void **) &hashed_ini_entry)==FAILURE) { @@ -151,6 +152,7 @@ ZEND_API int zend_register_ini_entries(zend_ini_entry *ini_entry, int module_num } p++; } +#endif return SUCCESS; } |