diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-02 12:15:23 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-02 12:15:23 (GMT) |
| commit | 474d95712ea623f7cccf704be60d713aa2ebe309 (patch) | |
| tree | bd8e84a71e7799de0d39a19caa754821d7da2926 /win/tclWinTime.c | |
| parent | 2a3d586a796e62f522303b3ab71c84743a73bf89 (diff) | |
| parent | adbd7d18869a4d99a25188fad9c3bbf55d072980 (diff) | |
| download | tcl-474d95712ea623f7cccf704be60d713aa2ebe309.zip tcl-474d95712ea623f7cccf704be60d713aa2ebe309.tar.gz tcl-474d95712ea623f7cccf704be60d713aa2ebe309.tar.bz2 | |
Merge 8.7. Continue implementation for win32
Diffstat (limited to 'win/tclWinTime.c')
| -rw-r--r-- | win/tclWinTime.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win/tclWinTime.c b/win/tclWinTime.c index bfebbe6..5890ce5 100644 --- a/win/tclWinTime.c +++ b/win/tclWinTime.c @@ -98,7 +98,7 @@ static TimeInfo timeInfo = { (HANDLE) NULL, (HANDLE) NULL, (HANDLE) NULL, -#ifdef HAVE_CAST_TO_UNION +#if defined(HAVE_CAST_TO_UNION) && !defined(__cplusplus) (LARGE_INTEGER) (Tcl_WideInt) 0, (ULARGE_INTEGER) (DWORDLONG) 0, (LARGE_INTEGER) (Tcl_WideInt) 0, @@ -124,7 +124,7 @@ static struct { int initialized; /* 1 if initialized, 0 otherwise */ int perfCounter; /* 1 if performance counter usable for wide clicks */ double microsecsScale; /* Denominator scale between clock / microsecs */ -} wideClick = {0, 0.0}; +} wideClick = {0, 0, 0.0}; /* |