summaryrefslogtreecommitdiffstats
path: root/win
diff options
context:
space:
mode:
authorKevin B Kenny <kennykb@acm.org>2004-09-07 17:38:55 (GMT)
committerKevin B Kenny <kennykb@acm.org>2004-09-07 17:38:55 (GMT)
commite8e954f6105c001bef0d51e5746b3802e306a43c (patch)
tree1f689fb60e26061c50d8ead40202c15fc42bdc48 /win
parentc82232c5071d315f5a14e7828abdb48da9d6463e (diff)
downloadtcl-e8e954f6105c001bef0d51e5746b3802e306a43c.zip
tcl-e8e954f6105c001bef0d51e5746b3802e306a43c.tar.gz
tcl-e8e954f6105c001bef0d51e5746b3802e306a43c.tar.bz2
* generic/tclTimer.c: Removed a premature optimisation that
attempted to store the assoc data in the client data; the optimisation caused a bug that [after] would overwrite its imports. [Bug 1016167] * library/clock.tcl (InitTZData, ClearCaches): Changed so that the in-memory time zone :UTC (and its aliases) always gets reinitialised, in case tzdata is absent. [Bug 1019537, 1023779] * library/tzdata/*: Regenerated. * tests/clock.test (clock-31.*, clock-39.1): Corrected a problem where the 'system' locale tests fail on a non-English Windows machine. [Bug 1023761]. Added a test to make sure that alias time zones load correctly. [Bug 1023779]. * tools/tclZIC.tcl (writeLinks): Corrected a problem where alias time zone names were written incorrectly, causing them to fail to load at run time. [Bug 1023779]. * win/tclWinTime.c (Tcl_GetTime): Eliminated CPUID tests on Win64 - assuming that HAL vendors now do a better job of keeping the performance counters synchronized among CPU's. [Bug 1020445]
Diffstat (limited to 'win')
-rw-r--r--win/tclWinTime.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/win/tclWinTime.c b/win/tclWinTime.c
index 2fc9ea0..48460bb 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.27 2004/06/05 17:31:08 kennykb Exp $
+ * RCS: @(#) $Id: tclWinTime.c,v 1.28 2004/09/07 17:39:00 kennykb Exp $
*/
#include "tclInt.h"
@@ -300,8 +300,13 @@ Tcl_GetTime(timePtr)
* appears to fiddle with the definition of the perf counter
* frequency (perhaps in an attempt to calibrate the clock?)
* we use the latter rule rather than an exact match.
+ *
+ * We also assume (perhaps questionably) that the vendors
+ * have gotten their act together on Win64, so bypass all
+ * this rubbish on that platform.
*/
+#if !defined(_WIN64)
if ( timeInfo.perfCounterAvailable
/* The following lines would do an exact match on
* crystal frequency:
@@ -341,6 +346,7 @@ Tcl_GetTime(timePtr)
}
}
+#endif /* above code is Win32 only */
/*
* If the performance counter is available, start a thread to