[Winmerge-svn] SF.net SVN: winmerge: [3643] trunk/Src
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ki...@us...> - 2006-09-26 15:18:46
|
Revision: 3643 http://svn.sourceforge.net/winmerge/?rev=3643&view=rev Author: kimmov Date: 2006-09-26 08:18:40 -0700 (Tue, 26 Sep 2006) Log Message: ----------- PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6 Modified Paths: -------------- trunk/Src/Changes.txt trunk/Src/Common/coretools.cpp Modified: trunk/Src/Changes.txt =================================================================== --- trunk/Src/Changes.txt 2006-09-25 22:05:46 UTC (rev 3642) +++ trunk/Src/Changes.txt 2006-09-26 15:18:40 UTC (rev 3643) @@ -2,6 +2,10 @@ Add new items to top. (This summarizes all changes to all files under Src, including Src\Languages.) +2006-09-26 Kimmo + PATCH: [ 1564857 ] FindAnyFile function doesn't compile with VC6 + Src/Common: coretools.cpp + 2006-09-25 Kimmo PATCH: [ 1563171 ] Catalan translation update (Open-dialog) Submitted by Jordi Vilar Modified: trunk/Src/Common/coretools.cpp =================================================================== --- trunk/Src/Common/coretools.cpp 2006-09-25 22:05:46 UTC (rev 3642) +++ trunk/Src/Common/coretools.cpp 2006-09-26 15:18:40 UTC (rev 3643) @@ -489,17 +489,22 @@ BOOL FindAnyFile(LPTSTR filespec, LPTSTR name) { -#ifndef _UNICODE - struct __finddata64_t c_file; +// Use 64-bit versions with VS2003.Net and later +#if _MSC_VER >= 1300 + _tfinddata64_t c_file; + intptr_t hFile; + hFile = _tfindfirst64( filespec, &c_file ); #else - struct __wfinddata64_t c_file; -#endif - intptr_t hFile; +// Use 32-bit versions with VC6 + _tfinddata_t c_file; + long hFile; + hFile = _tfindfirst( filespec, &c_file ); +#endif // _MSC_VER >= 1300 - if( (hFile = _tfindfirst64( filespec, &c_file )) == -1L ) - return FALSE; + if (hFile == -1L) + return FALSE; - _tcscpy(name, c_file.name); + _tcscpy(name, c_file.name); _findclose( hFile ); return TRUE; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |