diff options
author | patthoyts <patthoyts@users.sourceforge.net> | 2009-04-29 15:24:16 (GMT) |
---|---|---|
committer | patthoyts <patthoyts@users.sourceforge.net> | 2009-04-29 15:24:16 (GMT) |
commit | 268de519126607c8691aea2e50f22ffee53dab6a (patch) | |
tree | d6d7e02a2f344708e489bf56ca0f72e5524e166b | |
parent | bd059b3e984f4ed7094e35e91d6298cee7f4342f (diff) | |
download | tcl-268de519126607c8691aea2e50f22ffee53dab6a.zip tcl-268de519126607c8691aea2e50f22ffee53dab6a.tar.gz tcl-268de519126607c8691aea2e50f22ffee53dab6a.tar.bz2 |
Revert last commit which fails to build with msvc2005 and msvc6
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | generic/tcl.h | 8 |
2 files changed, 4 insertions, 9 deletions
@@ -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 dd3dc41..a57d683 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.290 2009/04/29 14:57:01 dkf Exp $ + * RCS: @(#) $Id: tcl.h,v 1.291 2009/04/29 15:24:20 patthoyts 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(_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__ */ |