[Winmerge-svn] SF.net SVN: winmerge: [3615] trunk/Src

[<ki...@us...>]

Revision: 3615
          http://svn.sourceforge.net/winmerge/?rev=3615&view=rev
Author:   kimmov
Date:     2006-09-22 07:35:50 -0700 (Fri, 22 Sep 2006)

Log Message:
-----------
PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit

Modified Paths:
--------------
    trunk/Src/Changes.txt
    trunk/Src/Common/coretools.cpp
    trunk/Src/Common/coretools.h

Modified: trunk/Src/Changes.txt
===================================================================
--- trunk/Src/Changes.txt	2006-09-21 18:53:47 UTC (rev 3614)
+++ trunk/Src/Changes.txt	2006-09-22 14:35:50 UTC (rev 3615)
@@ -2,6 +2,10 @@
 Add new items to top.
 (This summarizes all changes to all files under Src, including Src\Languages.)
 
+2006-09-22 Kimmo
+ PATCH: [ 1563157 ] Fix coretools.cpp for 64-bit
+  Src/Common: coretools.cpp coretools.h
+
 2006-09-21 WinMerge experimental release 2.5.7.1 (SVN revision 3600)
 
 2006-09-21 Kimmo

Modified: trunk/Src/Common/coretools.cpp
===================================================================
--- trunk/Src/Common/coretools.cpp	2006-09-21 18:53:47 UTC (rev 3614)
+++ trunk/Src/Common/coretools.cpp	2006-09-22 14:35:50 UTC (rev 3615)
@@ -61,7 +61,7 @@
 	return FALSE;
 }
 
-long GetFileModTime(LPCTSTR szPath)
+time_t GetFileModTime(LPCTSTR szPath)
 {
 	if (!szPath || !szPath[0]) return 0;
 	struct _stat mystats;
@@ -490,13 +490,13 @@
 BOOL FindAnyFile(LPTSTR filespec, LPTSTR name)
 {
 #ifndef _UNICODE
-   struct _finddata_t c_file;
+   struct __finddata64_t c_file;
 #else
-   struct _wfinddata_t c_file;
+   struct __wfinddata64_t c_file;
 #endif
-   long hFile;
+   intptr_t hFile;
 
-   if( (hFile = _tfindfirst( filespec, &c_file )) == -1L )
+   if( (hFile = _tfindfirst64( filespec, &c_file )) == -1L )
        return FALSE;
 
     _tcscpy(name, c_file.name);

Modified: trunk/Src/Common/coretools.h
===================================================================
--- trunk/Src/Common/coretools.h	2006-09-21 18:53:47 UTC (rev 3614)
+++ trunk/Src/Common/coretools.h	2006-09-22 14:35:50 UTC (rev 3615)
@@ -91,7 +91,7 @@
 				  LPSYSTEMTIME pMod,
 				  LPSYSTEMTIME pCreate =NULL,
 				  LPSYSTEMTIME pAccess =NULL);
-long GetFileModTime(LPCTSTR szPath);
+time_t GetFileModTime(LPCTSTR szPath);
 DWORD GetFileSizeEx(LPCTSTR szFilename);
 CString GetCDPath();
 BOOL HaveAdminAccess();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.