From: Zeev Suraski Date: Sat, 11 May 2002 13:49:44 +0000 (+0000) Subject: Use portable #define X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~122 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b9fd10786b462102b29b9d60acb59fd5388f94f1;p=php Use portable #define --- diff --git a/main/php_ini.c b/main/php_ini.c index 2d4c8f5f55..6610775a68 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -233,7 +233,7 @@ int php_init_config() 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 @@ int php_init_config() /* 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 @@ int php_init_config() /* 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);