diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-04-18 08:22:16 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2011-04-18 08:22:16 (GMT) |
commit | 0ea84b224e11c4a29414412e851b83ce686fc18f (patch) | |
tree | e6a93d747c0938c5bb1ad04b9b11a221a7a969d4 /generic/tcl.h | |
parent | c3584c9070d07ea75847729376ce1b01e22a3d79 (diff) | |
parent | 2ff3045fc5ea4496e0c6cde7a475aea5173f5a73 (diff) | |
download | tcl-0ea84b224e11c4a29414412e851b83ce686fc18f.zip tcl-0ea84b224e11c4a29414412e851b83ce686fc18f.tar.gz tcl-0ea84b224e11c4a29414412e851b83ce686fc18f.tar.bz2 |
fix for [Bug 3288345]: Wrong Tcl_StatBuf used on MinGW
Diffstat (limited to 'generic/tcl.h')
-rw-r--r-- | generic/tcl.h | 16 |
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 |