cvs: TSRM / tsrm_virtual_cwd.h

derick Fri May 2 14:16:40 2008 UTC Modified files: /TSRM tsrm_virtual_cwd.h Log: - More coffee required... http://cvs.php.net/viewvc.cgi/TSRM/tsrm_virtual_cwd.h?r1=1.67&r2=1.68&diff_format=u Index: TSRM/tsrm_virtual_cwd.h diff -u TSRM/tsrm_virtual_cwd.h:1.67 TSRM/tsrm_virtual_cwd.h:1.68 --- TSRM/tsrm_virtual_cwd.h:1.67 Fri May 2 14:08:44 2008 +++ TSRM/tsrm_virtual_cwd.h Fri May 2 14:16:40 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: tsrm_virtual_cwd.h,v 1.67 2008/05/02 14:08:44 derick Exp $ */ +/* $Id: tsrm_virtual_cwd.h,v 1.68 2008/05/02 14:16:40 derick Exp $ */ #ifndef VIRTUAL_CWD_H #define VIRTUAL_CWD_H @@ -297,9 +297,9 @@ /* rename on windows will fail if newname already exists. MoveFileEx has to be used */ #if defined(TSRM_WIN32) -# define VCWD_RENAME(oldname, newname) MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING) -#else # define VCWD_RENAME(oldname, newname) (MoveFileEx(oldname, newname, MOVEFILE_REPLACE_EXISTING) == 0 ? -1 : 0) +#else +# define VCWD_RENAME(oldname, newname) rename(oldname, newname) #endif #define VCWD_CHDIR(path) chdir(path) #define VCWD_CHDIR_FILE(path) virtual_chdir_file(path, chdir)