diff options
| author | mdejong <mdejong> | 2003-04-14 02:36:57 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2003-04-14 02:36:57 (GMT) |
| commit | 0642c2ce3305c22c76c707fe3a2b4adc74c36c72 (patch) | |
| tree | da9db3b4445736bddeaa994bdd7e2c453a4a5ba8 /win/tclWinTime.c | |
| parent | 37ff37a0b748da5dcebf15c20e744d8573aeb7a6 (diff) | |
| download | tcl-0642c2ce3305c22c76c707fe3a2b4adc74c36c72.zip tcl-0642c2ce3305c22c76c707fe3a2b4adc74c36c72.tar.gz tcl-0642c2ce3305c22c76c707fe3a2b4adc74c36c72.tar.bz2 | |
* win/configure: Regen.
* win/configure.in: Add check for FINDEX_INFO_LEVELS
from winbase.h, known to be a problem in VC++ 5.2.
Define HAVE_NO_FINDEX_ENUMS if the define does not
exist.
* win/tclWinFile.c: Put declarations for
FINDEX_INFO_LEVELS and FINDEX_SEARCH_OPS inside
a check for HAVE_NO_FINDEX_ENUMS so that these are
not declared twice. This fixes the Mingw build.
* win/tclWinTime.c: Rework the init of timeInfo
so that the number or initializers matches the
declaration. This was broken under Mingw. Add
cast to avoid compile warning when calling the
AccumulateSample function.
Diffstat (limited to 'win/tclWinTime.c')
| -rw-r--r-- | win/tclWinTime.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/win/tclWinTime.c b/win/tclWinTime.c index 5e3b66b..975b78f 100644 --- a/win/tclWinTime.c +++ b/win/tclWinTime.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinTime.c,v 1.15 2003/04/12 19:08:56 kennykb Exp $ + * RCS: @(#) $Id: tclWinTime.c,v 1.16 2003/04/14 02:36:58 mdejong Exp $ */ #include "tclWinInt.h" @@ -106,6 +106,7 @@ static TimeInfo timeInfo = { (HANDLE) NULL, (HANDLE) NULL, #ifdef HAVE_CAST_TO_UNION + (LARGE_INTEGER) (LONGLONG) 0, (ULARGE_INTEGER) (DWORDLONG) 0, (LARGE_INTEGER) (LONGLONG) 0, (LARGE_INTEGER) (LONGLONG) 0, @@ -113,13 +114,10 @@ static TimeInfo timeInfo = { 0, 0, 0, -#endif - 0, - 0, 0, +#endif { 0 }, { 0 }, - 0, 0 }; @@ -875,7 +873,7 @@ UpdateTimeEachSecond() */ estFreq = AccumulateSample( curPerfCounter.QuadPart, - curFileTime.QuadPart ); + (ULONGLONG) curFileTime.QuadPart ); /* * We want to adjust things so that time appears to be continuous. |