diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-10-11 13:57:53 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-10-11 13:57:53 (GMT) |
| commit | 918f0fe1aa72e58361aaccf1c8c756a5687bc866 (patch) | |
| tree | e7cb1aef9d3c96daaa7caf50b06011b2925bdc8e /generic/tclDecls.h | |
| parent | 343851002d0cb0f2939aaf96a761357f0b7c972f (diff) | |
| parent | f43dd68346925f9c2ab0b55fe60e1cec2526d9dc (diff) | |
| download | tcl-918f0fe1aa72e58361aaccf1c8c756a5687bc866.zip tcl-918f0fe1aa72e58361aaccf1c8c756a5687bc866.tar.gz tcl-918f0fe1aa72e58361aaccf1c8c756a5687bc866.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclDecls.h')
| -rw-r--r-- | generic/tclDecls.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/generic/tclDecls.h b/generic/tclDecls.h index f833206..71c5e47 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -4129,7 +4129,20 @@ extern const TclStubs *tclStubsPtr; } while(0) #endif /* TCL_NO_DEPRECATED */ -#if defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) +#if defined(USE_TCL_STUBS) +# if defined(_WIN32) && defined(_WIN64) +# undef Tcl_GetTime +/* Handle Win64 tk.dll being loaded in Cygwin64. */ +# define Tcl_GetTime(t) \ + do { \ + Tcl_Time *_timePtr = (t); \ + _timePtr->reserved = -1; \ + tclStubsPtr->tcl_GetTime((_timePtr)); \ + if (_timePtr->reserved != -1) { \ + _timePtr->usec = _timePtr->reserved; \ + } \ + } while (0) +# endif # if defined(__CYGWIN__) && defined(TCL_WIDE_INT_IS_LONG) /* On Cygwin64, long is 64-bit while on Win64 long is 32-bit. Therefore * we have to make sure that all stub entries on Cygwin64 follow the |