From 79973f0cfe1d4c6e288f0c5f3ed5cb00e052c6aa Mon Sep 17 00:00:00 2001
From: jan <jan>
Date: Wed, 20 Apr 2011 00:01:54 +0000
Subject: fix for [Bug 3288345]: Wrong Tcl_StatBuf used on MinGW. Follow-up:
 get it right for cygwin and WIN64 as well.

---
 ChangeLog           | 5 +++++
 generic/tcl.h       | 8 +++++---
 generic/tclIOUtil.c | 2 +-
 generic/tclInt.h    | 2 +-
 win/tclWinFile.c    | 5 +++--
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 87720e0..b0046a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 2011-04-18  Jan Nijtmans  <nijtmans@users.sf.net>
 
 	* generic/tcl.h: fix for [Bug 3288345]: Wrong Tcl_StatBuf
+	used on MinGW. Follow-up: get it right for cygwin and WIN64
+
+2011-04-18  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tcl.h: fix for [Bug 3288345]: Wrong Tcl_StatBuf
 	used on MinGW.
 
 2011-04-13  Miguel Sofer  <msofer@users.sf.net>
diff --git a/generic/tcl.h b/generic/tcl.h
index a98b685..264363d 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -372,17 +372,19 @@ typedef long LONG;
  */
 
 #if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG)
-#   if defined(__WIN32__)
+#   if defined(__WIN32__) && !defined(__CYGWIN__)
 #      define TCL_WIDE_INT_TYPE __int64
 #      ifdef __BORLANDC__
 typedef struct stati64 Tcl_StatBuf;
 #         define TCL_LL_MODIFIER	"L"
 #         define TCL_LL_MODIFIER_SIZE	1
 #      else /* __BORLANDC__ */
-#         if (defined(_MSC_VER) && (_MSC_VER < 1400)) || !defined(_M_IX86)
+#         if defined(_WIN64)
+typedef struct _stat64 Tcl_StatBuf;
+#         elif (defined(_MSC_VER) && (_MSC_VER < 1400))
 typedef struct _stati64	Tcl_StatBuf;
 #         else
-typedef struct _stat64 Tcl_StatBuf;
+typedef struct _stat32i64 Tcl_StatBuf;
 #         endif /* _MSC_VER < 1400 */
 #         define TCL_LL_MODIFIER	"I64"
 #         define TCL_LL_MODIFIER_SIZE	3
diff --git a/generic/tclIOUtil.c b/generic/tclIOUtil.c
index 256cd60..32658a8 100644
--- a/generic/tclIOUtil.c
+++ b/generic/tclIOUtil.c
@@ -1910,7 +1910,7 @@ Tcl_FSStat(pathPtr, buf)
 {
     Tcl_Filesystem *fsPtr;
 #ifdef USE_OBSOLETE_FS_HOOKS
-    struct stat oldStyleStatBuffer;
+    Tcl_StatBuf oldStyleStatBuffer;
     int retVal = -1;
 
     /*
diff --git a/generic/tclInt.h b/generic/tclInt.h
index 607dc80..b080fef 100644
--- a/generic/tclInt.h
+++ b/generic/tclInt.h
@@ -1795,7 +1795,7 @@ typedef struct TclpTime_t_    *CONST TclpTime_t_CONST;
  *----------------------------------------------------------------
  */
 
-typedef int (TclStatProc_) _ANSI_ARGS_((CONST char *path, struct stat *buf));
+typedef int (TclStatProc_) _ANSI_ARGS_((CONST char *path, Tcl_StatBuf *buf));
 typedef int (TclAccessProc_) _ANSI_ARGS_((CONST char *path, int mode));
 typedef Tcl_Channel (TclOpenFileChannelProc_) _ANSI_ARGS_((Tcl_Interp *interp,
 	CONST char *fileName, CONST char *modeString,
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 5f88cb2..99dfc2f 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -12,8 +12,9 @@
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  */
 
-//#define _WIN32_WINNT  0x0500
-
+#ifndef _WIN64
+#   define _USE_32BIT_TIME_T
+#endif
 #include "tclWinInt.h"
 #include <winioctl.h>
 #include <sys/stat.h>
-- 
cgit v0.12