summaryrefslogtreecommitdiffstats
path: root/generic/tcl.h
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2011-05-10 16:05:48 (GMT)
committerdgp <dgp@users.sourceforge.net>2011-05-10 16:05:48 (GMT)
commit8b55adfd6cb802445c043214a0dcec65d8ecfcf1 (patch)
tree1ca2feda250662282a8e77080fef123d9256b839 /generic/tcl.h
parent29128e81d21dcc942fc8410424255017004b36ac (diff)
downloadtcl-8b55adfd6cb802445c043214a0dcec65d8ecfcf1.zip
tcl-8b55adfd6cb802445c043214a0dcec65d8ecfcf1.tar.gz
tcl-8b55adfd6cb802445c043214a0dcec65d8ecfcf1.tar.bz2
Completed patch with mucho comments. Merge 8.5.
Diffstat (limited to 'generic/tcl.h')
-rw-r--r--generic/tcl.h26
1 files changed, 14 insertions, 12 deletions
diff --git a/generic/tcl.h b/generic/tcl.h
index fe384c4..015995c 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -352,28 +352,30 @@ 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__) && !defined(__CYGWIN__)
# 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(_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"
# endif /* __BORLANDC__ */
-# else /* __WIN32__ */
+# elif defined(__GNUC__)
+# define TCL_WIDE_INT_TYPE long long
+# define TCL_LL_MODIFIER "ll"
+# if defined(__WIN32__)
+typedef struct _stat32i64 Tcl_StatBuf;
+# else
+typedef struct stat Tcl_StatBuf;
+# endif
+# else /* ! __WIN32__ && ! __GNUC__ */
/*
* Don't know what platform it is and configure hasn't discovered what is
* going on for us. Try to guess...