diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-07 14:03:35 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-07 14:03:35 (GMT) |
| commit | 58f3fe5abc9fd86c9386ae3685091551d7b3ee8b (patch) | |
| tree | 762c77ba73af509480f5941784d09b7bd883dfab /generic | |
| parent | 1f9311a1b70226567162c45c67294cea61572d07 (diff) | |
| parent | c92b03f0a41ea3598cc2953a87c251fac504bf7a (diff) | |
| download | tcl-58f3fe5abc9fd86c9386ae3685091551d7b3ee8b.zip tcl-58f3fe5abc9fd86c9386ae3685091551d7b3ee8b.tar.gz tcl-58f3fe5abc9fd86c9386ae3685091551d7b3ee8b.tar.bz2 | |
Merge 8.6. Remove 3 duplicate build-entries in .travis.yml
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tcl.h | 2 | ||||
| -rw-r--r-- | generic/tclBasic.c | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index f3253db..031b3f7 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -406,7 +406,7 @@ typedef unsigned TCL_WIDE_INT_TYPE Tcl_WideUInt; #if defined(_WIN32) # ifdef __BORLANDC__ typedef struct stati64 Tcl_StatBuf; -# elif defined(_WIN64) || defined(__MINGW_USE_VC2005_COMPAT) || defined(_USE_64BIT_TIME_T) +# elif defined(_WIN64) || defined(_USE_64BIT_TIME_T) typedef struct __stat64 Tcl_StatBuf; # elif (defined(_MSC_VER) && (_MSC_VER < 1400)) || defined(_USE_32BIT_TIME_T) typedef struct _stati64 Tcl_StatBuf; diff --git a/generic/tclBasic.c b/generic/tclBasic.c index f7bfa14..db1e526 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -657,19 +657,13 @@ Tcl_CreateInterp(void) Tcl_Panic("Tcl_CallFrame must not be smaller than CallFrame"); } -#if defined(_WIN32) && !defined(_WIN64) && !defined(_USE_64BIT_TIME_T) \ - && !defined(__MINGW_USE_VC2005_COMPAT) - /* If Tcl is compiled on Win32 using -D_USE_64BIT_TIME_T or - * -D__MINGW_USE_VC2005_COMPAT, the result is a binary incompatible - * with the 'standard' build of Tcl: All extensions using Tcl_StatBuf - * or interal functions like TclpGetDate() need to be recompiled in +#if defined(_WIN32) && !defined(_WIN64) && !defined(_USE_64BIT_TIME_T) + /* If Tcl is compiled on Win32 using -D_USE_64BIT_TIME_T + * the result is a binary incompatible with the 'standard' build of + * Tcl: All extensions using Tcl_StatBuf need to be recompiled in * the same way. Therefore, this is not officially supported. * In stead, it is recommended to use Win64 or Tcl 9.0 (not released yet) */ - if (sizeof(time_t) != 4) { - /*NOTREACHED*/ - Tcl_Panic("<time.h> is not compatible with MSVC"); - } if ((offsetof(Tcl_StatBuf,st_atime) != 32) || (offsetof(Tcl_StatBuf,st_ctime) != 40)) { /*NOTREACHED*/ |