cvs: php-src(PHP_5_2) /main php_ini.c

felipe Thu Aug 14 16:34:30 2008 UTC Modified files: (Branch: PHP_5_2) /php-src/main php_ini.c Log: - MFH: move declaration on top and fix build error http://cvs.php.net/viewvc.cgi/php-src/main/php_ini.c?r1=1.136.2.4.2.17&r2=1.136.2.4.2.18&diff_format=u Index: php-src/main/php_ini.c diff -u php-src/main/php_ini.c:1.136.2.4.2.17 php-src/main/php_ini.c:1.136.2.4.2.18 --- php-src/main/php_ini.c:1.136.2.4.2.17 Wed Aug 13 01:01:29 2008 +++ php-src/main/php_ini.c Thu Aug 14 16:34:30 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ini.c,v 1.136.2.4.2.17 2008/08/13 01:01:29 jani Exp $ */ +/* $Id: php_ini.c,v 1.136.2.4.2.18 2008/08/14 16:34:30 felipe Exp $ */ #include "php.h" #include "ext/standard/info.h" @@ -261,6 +261,7 @@ { char *php_ini_file_name = NULL; char *php_ini_search_path = NULL; + int php_ini_scanned_path_len; int safe_mode_state; char *open_basedir; int free_ini_search_path = 0; @@ -527,7 +528,7 @@ /* Or fall back using possible --with-config-file-scan-dir setting (defaults to empty string!) */ php_ini_scanned_path = PHP_CONFIG_FILE_SCAN_DIR; } - int php_ini_scanned_path_len = strlen(php_ini_scanned_path); + php_ini_scanned_path_len = strlen(php_ini_scanned_path); /* Scan and parse any .ini files found in scan path if path not empty. */ if (!sapi_module.php_ini_ignore && php_ini_scanned_path_len) {