mirror of
https://github.com/php/php-src.git
synced 2025-08-18 23:18:56 +02:00
- Change macros from V_ to VCWD_ because of AIX name clash
This commit is contained in:
parent
96330d36bc
commit
4c823e8a89
42 changed files with 152 additions and 152 deletions
|
@ -2502,11 +2502,11 @@ PHP_FUNCTION(move_uploaded_file)
|
|||
RETURN_FALSE;
|
||||
}
|
||||
|
||||
V_UNLINK(Z_STRVAL_PP(new_path));
|
||||
VCWD_UNLINK(Z_STRVAL_PP(new_path));
|
||||
if (rename(Z_STRVAL_PP(path), Z_STRVAL_PP(new_path))==0) {
|
||||
successful=1;
|
||||
} else if (php_copy_file(Z_STRVAL_PP(path), Z_STRVAL_PP(new_path))==SUCCESS) {
|
||||
V_UNLINK(Z_STRVAL_PP(path));
|
||||
VCWD_UNLINK(Z_STRVAL_PP(path));
|
||||
successful=1;
|
||||
}
|
||||
|
||||
|
@ -2604,7 +2604,7 @@ PHP_FUNCTION(parse_ini_file)
|
|||
}
|
||||
|
||||
convert_to_string_ex(filename);
|
||||
fh.handle.fp = V_FOPEN(Z_STRVAL_PP(filename), "r");
|
||||
fh.handle.fp = VCWD_FOPEN(Z_STRVAL_PP(filename), "r");
|
||||
if (!fh.handle.fp) {
|
||||
php_error(E_WARNING,"Cannot open '%s' for reading", Z_STRVAL_PP(filename));
|
||||
return;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue