diff options
| author | hobbs <hobbs> | 2002-05-29 00:19:39 (GMT) |
|---|---|---|
| committer | hobbs <hobbs> | 2002-05-29 00:19:39 (GMT) |
| commit | acc98cfd629f847b6e4b3e7eee967d7fe3f9bcdf (patch) | |
| tree | 29125ebe484614a6acad3335d784da4ad422b93a /generic/tclClock.c | |
| parent | 255468e31d6c18b6e10f63c0d914101824c2ce7f (diff) | |
| download | tcl-acc98cfd629f847b6e4b3e7eee967d7fe3f9bcdf.zip tcl-acc98cfd629f847b6e4b3e7eee967d7fe3f9bcdf.tar.gz tcl-acc98cfd629f847b6e4b3e7eee967d7fe3f9bcdf.tar.bz2 | |
* tests/clock.test: added clock-9.1
* compat/strftime.c:
* generic/tclClock.c:
* generic/tclInt.decls:
* generic/tclIntDecls.h:
* unix/tclUnixTime.c: fix for Windows msvcrt mem leak caused by
using an env(TZ) setting trick for in clock format -gmt 1. This
also makes %s seem to work correctly with -gmt 1 as well as
making it a lot faster by avoid the env(TZ) hack. TclpStrftime
now takes useGMT as an arg. [Bug #559376]
Diffstat (limited to 'generic/tclClock.c')
| -rw-r--r-- | generic/tclClock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclClock.c b/generic/tclClock.c index 5cfc675..9bf7ed0 100644 --- a/generic/tclClock.c +++ b/generic/tclClock.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclClock.c,v 1.14 2002/01/25 20:40:55 dgp Exp $ + * RCS: @(#) $Id: tclClock.c,v 1.15 2002/05/29 00:19:40 hobbs Exp $ */ #include "tcl.h" @@ -289,7 +289,7 @@ FormatClock(interp, clockVal, useGMT, format) return TCL_OK; } -#ifndef HAVE_TM_ZONE +#if !defined(HAVE_TM_ZONE) && !defined(WIN32) /* * This is a kludge for systems not having the timezone string in * struct tm. No matter what was specified, they use the local @@ -332,10 +332,10 @@ FormatClock(interp, clockVal, useGMT, format) Tcl_MutexLock(&clockMutex); result = TclpStrftime(buffer.string, (unsigned int) bufSize, format, - timeDataPtr); + timeDataPtr, useGMT); Tcl_MutexUnlock(&clockMutex); -#ifndef HAVE_TM_ZONE +#if !defined(HAVE_TM_ZONE) && !defined(WIN32) if (useGMT) { if (savedTZEnv != NULL) { Tcl_SetVar2(interp, "env", "TZ", savedTZEnv, TCL_GLOBAL_ONLY); |