summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpatthoyts <patthoyts@users.sourceforge.net>2009-04-29 15:47:05 (GMT)
committerpatthoyts <patthoyts@users.sourceforge.net>2009-04-29 15:47:05 (GMT)
commit24b0de09363c5d2c55f8f3cee608482a26d206fb (patch)
tree6457e97e33a5b5a08fe9efbc93915cc8e2193f34
parentc8dbde43253b501eae4a908359215b0a2c51f036 (diff)
downloadtcl-24b0de09363c5d2c55f8f3cee608482a26d206fb.zip
tcl-24b0de09363c5d2c55f8f3cee608482a26d206fb.tar.gz
tcl-24b0de09363c5d2c55f8f3cee608482a26d206fb.tar.bz2
Revert last commit which fails to build with msvc2005 and msvc6
-rw-r--r--ChangeLog5
-rw-r--r--generic/tcl.h8
2 files changed, 4 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index ddfcc46..9b54cfc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-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 a86e2f9..ad3021e 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -13,7 +13,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.254.2.10 2009/04/29 14:59:34 dkf Exp $
+ * RCS: @(#) $Id: tcl.h,v 1.254.2.11 2009/04/29 15:47:05 patthoyts Exp $
*/
#ifndef _TCL
@@ -367,12 +367,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(_WIN64)
+# else /* __BORLANDC__ */
+# if _MSC_VER < 1400 || !defined(_M_IX86)
typedef struct _stati64 Tcl_StatBuf;
# else
typedef struct _stat64 Tcl_StatBuf;
-# endif /* _MSC_VER < 1400 && _WIN64 */
+# endif /* _MSC_VER < 1400 */
# define TCL_LL_MODIFIER "I64"
# endif /* __BORLANDC__ */
# else /* __WIN32__ */