diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/php_ini.c | 9 | ||||
| -rw-r--r-- | main/php_ini.h | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 9ed975529e..8a103a08a3 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -840,13 +840,10 @@ PHPAPI int cfg_get_string(char *varname, char **result) } /* }}} */ -#if ZEND_DEBUG -#include "php_ini.h" -PHPAPI HashTable get_configuration_hash(void) +PHPAPI HashTable* php_ini_get_configuration_hash(void) /* {{{ */ { - return configuration_hash; -} -#endif + return &configuration_hash; +} /* }}} */ /* * Local variables: diff --git a/main/php_ini.h b/main/php_ini.h index d69793ae93..b5b2b65677 100644 --- a/main/php_ini.h +++ b/main/php_ini.h @@ -36,9 +36,7 @@ PHPAPI int php_parse_user_ini_file(char *dirname, char *ini_filename, HashTable PHPAPI void php_ini_activate_config(HashTable *source_hash, int modify_type, int stage TSRMLS_DC); PHPAPI void php_ini_activate_per_dir_config(char *path, uint path_len TSRMLS_DC); PHPAPI void php_ini_activate_per_host_config(char *host, uint host_len TSRMLS_DC); -#if ZEND_DEBUG -PHPAPI HashTable get_configuration_hash(void); -#endif +PHPAPI HashTable* php_in_get_configuration_hash(void); END_EXTERN_C() #define PHP_INI_USER ZEND_INI_USER |