cvs: php4 /main php_ini.c

zeev Sat May 11 09:49:44 2002 EDT Modified files: /php4/main php_ini.c Log: Use portable #define Index: php4/main/php_ini.c diff -u php4/main/php_ini.c:1.92 php4/main/php_ini.c:1.93 --- php4/main/php_ini.c:1.92 Sat May 11 08:41:33 2002 +++ php4/main/php_ini.c Sat May 11 09:49:44 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_ini.c,v 1.92 2002/05/11 12:41:33 zeev Exp $ */ +/* $Id: php_ini.c,v 1.93 2002/05/11 13:49:44 zeev Exp $ */ /* Check CWD for php.ini */ #define INI_CHECK_CWD @@ -233,7 +233,7 @@ char *default_location; char paths_separator[] = { ZEND_PATHS_SEPARATOR, 0 }; - php_ini_search_path = (char *) emalloc(MAX_PATH*3+strlen(env_location)+3+1); + php_ini_search_path = (char *) emalloc(MAXPATHLEN*3+strlen(env_location)+3+1); free_ini_search_path = 1; php_ini_search_path[0] = 0; @@ -251,8 +251,8 @@ /* Add binary directory */ #ifdef PHP_WIN32 - binary_location = (char *) emalloc(MAX_PATH); - if (GetModuleFileName(0, binary_location, MAX_PATH)==0) { + binary_location = (char *) emalloc(MAXPATHLEN); + if (GetModuleFileName(0, binary_location, MAXPATHLEN)==0) { efree(binary_location); binary_location = NULL; } @@ -282,9 +282,9 @@ /* Add default location */ #ifdef PHP_WIN32 - default_location = (char *) emalloc(MAX_PATH+1); + default_location = (char *) emalloc(MAXPATHLEN+1); - if (!GetWindowsDirectory(default_location, MAX_PATH)) { + if (!GetWindowsDirectory(default_location, MAXPATHLEN)) { default_location[0]=0; } strcat(php_ini_search_path, default_location);