Fix [4718b41c56d8c135] for win32. Now timestamps on Win32 can be > 19 january 2038.

Caveat: Now Tcl MUST be compiled with VS2005+, or any other compiler which has C headers compatible with VC2005+ (latest mingw-w64 is OK too!)
Tcl on Win32 is now no longer compiled with _USE_32BIT_TIME_T, so this is (potentially) binary incompatible.

4 files changed, 16 insertions, 28 deletions

diff --git a/generic/tcl.h b/generic/tcl.h
index 46561b5..37895b8 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -308,15 +308,7 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 #define Tcl_DoubleAsWide(val)	((Tcl_WideInt)((double)(val)))
 
 #if defined(_WIN32)
-#   ifdef __BORLANDC__
-	typedef struct stati64 Tcl_StatBuf;
-#   elif defined(_WIN64)
-	typedef struct __stat64 Tcl_StatBuf;
-#   elif (defined(_MSC_VER) && (_MSC_VER < 1400)) || defined(_USE_32BIT_TIME_T)
-	typedef struct _stati64	Tcl_StatBuf;
-#   else
-	typedef struct _stat32i64 Tcl_StatBuf;
-#   endif /* _MSC_VER < 1400 */
+    typedef struct __stat64 Tcl_StatBuf;
 #elif defined(__CYGWIN__)
     typedef struct {
 	dev_t st_dev;
@@ -329,13 +321,10 @@ typedef unsigned TCL_WIDE_INT_TYPE	Tcl_WideUInt;
 	dev_t st_rdev;
 	/* Here is a 4-byte gap */
 	long long st_size;
-	struct {long tv_sec;} st_atim;
-	struct {long tv_sec;} st_mtim;
-	struct {long tv_sec;} st_ctim;
-	/* Here is a 4-byte gap */
+	struct {long long tv_sec;} st_atim;
+	struct {long long tv_sec;} st_mtim;
+	struct {long long tv_sec;} st_ctim;
     } Tcl_StatBuf;
-#elif defined(HAVE_STRUCT_STAT64) && !defined(__APPLE__)
-    typedef struct stat64 Tcl_StatBuf;
 #else
     typedef struct stat Tcl_StatBuf;
 #endif
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index f957dc8..d35fa47 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -639,14 +639,14 @@ Tcl_CreateInterp(void)
     }
 
 #if defined(_WIN32) && !defined(_WIN64)
-    if (sizeof(time_t) != 4) {
+    if (sizeof(time_t) != 8) {
 	/*NOTREACHED*/
-	Tcl_Panic("<time.h> is not compatible with MSVC");
+	Tcl_Panic("<time.h> is not compatible with VS2005+");
     }
     if ((offsetof(Tcl_StatBuf,st_atime) != 32)
-	    || (offsetof(Tcl_StatBuf,st_ctime) != 40)) {
+	    || (offsetof(Tcl_StatBuf,st_ctime) != 48)) {
 	/*NOTREACHED*/
-	Tcl_Panic("<sys/stat.h> is not compatible with MSVC");
+	Tcl_Panic("<sys/stat.h> is not compatible with VS2005+");
     }
 #endif
 
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 080156e..14c4378 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -149,8 +149,8 @@ typedef struct {
  * Other typedefs required by this code.
  */
 
-static time_t		ToCTime(FILETIME fileTime);
-static void		FromCTime(time_t posixTime, FILETIME *fileTime);
+static __time64_t		ToCTime(FILETIME fileTime);
+static void		FromCTime(__time64_t posixTime, FILETIME *fileTime);
 
 /*
  * Declarations for local functions defined in this file:
@@ -2265,7 +2265,7 @@ NativeStatMode(
  *
  * ToCTime --
  *
- *	Converts a Windows FILETIME to a time_t in UTC.
+ *	Converts a Windows FILETIME to a __time64_t in UTC.
  *
  * Results:
  *	Returns the count of seconds from the Posix epoch.
@@ -2273,7 +2273,7 @@ NativeStatMode(
  *------------------------------------------------------------------------
  */
 
-static time_t
+static __time64_t
 ToCTime(
     FILETIME fileTime)		/* UTC time */
 {
@@ -2282,7 +2282,7 @@ ToCTime(
     convertedTime.LowPart = fileTime.dwLowDateTime;
     convertedTime.HighPart = (LONG) fileTime.dwHighDateTime;
 
-    return (time_t) ((convertedTime.QuadPart -
+    return (__time64_t) ((convertedTime.QuadPart -
 	    (Tcl_WideInt) POSIX_EPOCH_AS_FILETIME) / (Tcl_WideInt) 10000000);
 }
 
@@ -2291,7 +2291,7 @@ ToCTime(
  *
  * FromCTime --
  *
- *	Converts a time_t to a Windows FILETIME
+ *	Converts a __time64_t to a Windows FILETIME
  *
  * Results:
  *	Returns the count of 100-ns ticks seconds from the Windows epoch.
@@ -2301,7 +2301,7 @@ ToCTime(
 
 static void
 FromCTime(
-    time_t posixTime,
+    __time64_t posixTime,
     FILETIME *fileTime)		/* UTC Time */
 {
     LARGE_INTEGER convertedTime;
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index e74ee1c..5bcf76c 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -15,8 +15,7 @@
 #define _TCLWINPORT
 
 #if !defined(_WIN64) && defined(BUILD_tcl)
-/* See [Bug 3354324]: file mtime sets wrong time */
-#   define _USE_32BIT_TIME_T
+#   define __MINGW_USE_VC2005_COMPAT
 #endif
 
 /*