summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-04-18 08:22:16 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-04-18 08:22:16 (GMT)
commitae1e62908f477136ea8d2d65e1c4b8603bccbd05 (patch)
treee6a93d747c0938c5bb1ad04b9b11a221a7a969d4 /generic
parent915f2744b9947b03a54a56f1bcedbe611452ba56 (diff)
parenta6a5cd0c448ed7eab1edf7e9812853b9111593d5 (diff)
downloadtcl-ae1e62908f477136ea8d2d65e1c4b8603bccbd05.zip
tcl-ae1e62908f477136ea8d2d65e1c4b8603bccbd05.tar.gz
tcl-ae1e62908f477136ea8d2d65e1c4b8603bccbd05.tar.bz2
fix for [Bug 3288345]: Wrong Tcl_StatBuf used on MinGW
Diffstat (limited to 'generic')
-rw-r--r--generic/tcl.h16
1 files changed, 6 insertions, 10 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index 45da4f1..61e9a8a 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -352,27 +352,23 @@ typedef long LONG;
*/
#if !defined(TCL_WIDE_INT_TYPE)&&!defined(TCL_WIDE_INT_IS_LONG)
-# if defined(__GNUC__)
-# define TCL_WIDE_INT_TYPE long long
-# if defined(__WIN32__) && !defined(__CYGWIN__)
-# define TCL_LL_MODIFIER "I64"
-# else
-# define TCL_LL_MODIFIER "ll"
-# endif
-typedef struct stat Tcl_StatBuf;
-# elif defined(__WIN32__)
+# if defined(__WIN32__)
# define TCL_WIDE_INT_TYPE __int64
# ifdef __BORLANDC__
typedef struct stati64 Tcl_StatBuf;
# define TCL_LL_MODIFIER "L"
# else /* __BORLANDC__ */
-# if _MSC_VER < 1400 || !defined(_M_IX86)
+# if (defined(_MSC_VER) && (_MSC_VER < 1400)) || !defined(_M_IX86) || defined(__GNUC__)
typedef struct _stati64 Tcl_StatBuf;
# else
typedef struct _stat64 Tcl_StatBuf;
# endif /* _MSC_VER < 1400 */
# define TCL_LL_MODIFIER "I64"
# endif /* __BORLANDC__ */
+# elif defined(__GNUC__)
+# define TCL_WIDE_INT_TYPE long long
+# define TCL_LL_MODIFIER "ll"
+typedef struct stat Tcl_StatBuf;
# else /* __WIN32__ */
/*
* Don't know what platform it is and configure hasn't discovered what is