summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-04-18 08:38:41 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-04-18 08:38:41 (GMT)
commit0b32f3c0e110a1766217c7540ee8d14ef79df71b (patch)
tree6b93c93254713506fc554c63aa7f08fa82aba81c
parent174c06daec1b5f39ec637b65c3e5d3844708355b (diff)
parentae1e62908f477136ea8d2d65e1c4b8603bccbd05 (diff)
downloadtcl-0b32f3c0e110a1766217c7540ee8d14ef79df71b.zip
tcl-0b32f3c0e110a1766217c7540ee8d14ef79df71b.tar.gz
tcl-0b32f3c0e110a1766217c7540ee8d14ef79df71b.tar.bz2
fix for [Bug 3288345]: Wrong Tcl_StatBuf used on MinGW.
-rw-r--r--ChangeLog5
-rw-r--r--generic/tcl.h16
2 files changed, 11 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 13aa14a..670038a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-18 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tcl.h: fix for [Bug 3288345]: Wrong Tcl_StatBuf
+ used on MinGW.
+
2011-04-16 Donal K. Fellows <dkf@users.sf.net>
* generic/tclFCmd.c (TclFileAttrsCmd): Add comments to make this code
diff --git a/generic/tcl.h b/generic/tcl.h
index ed63f8f..5e82432 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -373,27 +373,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