diff options
| -rw-r--r-- | generic/tcl.h | 3 | ||||
| -rw-r--r-- | generic/tclDecls.h | 14 |
2 files changed, 9 insertions, 8 deletions
diff --git a/generic/tcl.h b/generic/tcl.h index 827dc0a..2dc3ae2 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -1420,9 +1420,6 @@ typedef enum { typedef struct Tcl_Time { long sec; /* Seconds. */ long usec; /* Microseconds. */ -#if defined(_WIN32) && defined(_WIN64) - __int64 reserved; /* Not used, except for win64 <-> Cygwin64 interoperability. */ -#endif } Tcl_Time; typedef void (Tcl_SetTimerProc) (CONST86 Tcl_Time *timePtr); diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 26d1cd6..23f0bae 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3954,12 +3954,16 @@ extern const TclStubs *tclStubsPtr; /* 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; \ + union { \ + Tcl_Time now; \ + __int64 reserved; \ + } _t; \ + _t.reserved = -1; \ + tclStubsPtr->tcl_GetTime((&_t.now)); \ + if (_t.reserved != -1) { \ + _t.now.usec = _t.reserved; \ } \ + *t = _t.now; \ } while (0) # endif # if defined(__CYGWIN__) && defined(TCL_WIDE_INT_IS_LONG) |