pajoye Wed Aug 13 17:49:14 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/main php_ini.c Log: - 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.15.2.10&r2=1.136.2.4.2.15.2.11&diff_format=u Index: php-src/main/php_ini.c diff -u php-src/main/php_ini.c:1.136.2.4.2.15.2.10 php-src/main/php_ini.c:1.136.2.4.2.15.2.11 --- php-src/main/php_ini.c:1.136.2.4.2.15.2.10 Wed Aug 13 00:53:28 2008 +++ php-src/main/php_ini.c Wed Aug 13 17:49:13 2008 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ini.c,v 1.136.2.4.2.15.2.10 2008/08/13 00:53:28 jani Exp $ */ +/* $Id: php_ini.c,v 1.136.2.4.2.15.2.11 2008/08/13 17:49:13 pajoye Exp $ */ #include "php.h" #include "ext/standard/info.h" @@ -340,6 +340,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; @@ -602,7 +603,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) {
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php