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

diff --git a/Src/Changes.txt b/Src/Changes.txt
index 602777a..1f262cc 100644 (file)
--- a/Src/Changes.txt
+++ b/Src/Changes.txt
@@ -2,6 +2,10 @@ Src\Changes.txt
 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

diff --git a/Src/Common/coretools.cpp b/Src/Common/coretools.cpp
index c6f7959..065f2f6 100644 (file)
--- a/Src/Common/coretools.cpp
+++ b/Src/Common/coretools.cpp
@@ -61,7 +61,7 @@ BOOL GetFileTimes(LPCTSTR szFilename,
        return FALSE;
 }
 
-long GetFileModTime(LPCTSTR szPath)
+time_t GetFileModTime(LPCTSTR szPath)
 {
        if (!szPath || !szPath[0]) return 0;
        struct _stat mystats;
@@ -490,13 +490,13 @@ aswap(LPTSTR a,LPTSTR b)
 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);

diff --git a/Src/Common/coretools.h b/Src/Common/coretools.h
index e7568fc..1c32ea9 100644 (file)
--- a/Src/Common/coretools.h
+++ b/Src/Common/coretools.h
@@ -91,7 +91,7 @@ BOOL GetFileTimes(LPCTSTR szFilename,
                                  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();