summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2009-04-29 14:56:56 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2009-04-29 14:56:56 (GMT)
commitbd059b3e984f4ed7094e35e91d6298cee7f4342f (patch)
treea277ffbc4f9ce07501ae1a0091469677e4b6f1a3
parenta084e20d7a737e54cee53c89b1ac6e0c0ecd5e8f (diff)
downloadtcl-bd059b3e984f4ed7094e35e91d6298cee7f4342f.zip
tcl-bd059b3e984f4ed7094e35e91d6298cee7f4342f.tar.gz
tcl-bd059b3e984f4ed7094e35e91d6298cee7f4342f.tar.bz2
Fix [Bug 2651823].
-rw-r--r--ChangeLog5
-rw-r--r--generic/tcl.h8
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 28165b3..db508b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-29 Donal K. Fellows <dkf@users.sf.net>
+
+ * generic/tcl.h (Tcl_StatBuf): [Bug 2651823]: Improved logic for
+ detecting what base API to use on Win64, supplied by Fausto Lubatti.
+
2009-04-28 Jeff Hobbs <jeffh@ActiveState.com>
* unix/tcl.m4, unix/configure (SC_CONFIG_CFLAGS): harden the check
diff --git a/generic/tcl.h b/generic/tcl.h
index b5bced7..dd3dc41 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -14,7 +14,7 @@
* See the file "license.terms" for information on usage and redistribution of
* this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tcl.h,v 1.289 2009/03/19 23:31:36 msofer Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.290 2009/04/29 14:57:01 dkf Exp $
*/
#ifndef _TCL
@@ -380,12 +380,12 @@ typedef struct stat Tcl_StatBuf;
# ifdef __BORLANDC__
typedef struct stati64 Tcl_StatBuf;
# define TCL_LL_MODIFIER "L"
-# else /* __BORLANDC__ */
-# if _MSC_VER < 1400 || !defined(_M_IX86)
+# else /* !__BORLANDC__ */
+# if _MSC_VER < 1400 && defined(_WIN64)
typedef struct _stati64 Tcl_StatBuf;
# else
typedef struct _stat64 Tcl_StatBuf;
-# endif /* _MSC_VER < 1400 */
+# endif /* _MSC_VER < 1400 && _WIN64 */
# define TCL_LL_MODIFIER "I64"
# endif /* __BORLANDC__ */
# else /* __WIN32__ */