summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixTime.c
diff options
context:
space:
mode:
authorstanton <stanton>1999-04-16 00:46:29 (GMT)
committerstanton <stanton>1999-04-16 00:46:29 (GMT)
commit97464e6cba8eb0008cf2727c15718671992b913f (patch)
treece9959f2747257d98d52ec8d18bf3b0de99b9535 /unix/tclUnixTime.c
parenta8c96ddb94d1483a9de5e340b740cb74ef6cafa7 (diff)
downloadtcl-97464e6cba8eb0008cf2727c15718671992b913f.zip
tcl-97464e6cba8eb0008cf2727c15718671992b913f.tar.gz
tcl-97464e6cba8eb0008cf2727c15718671992b913f.tar.bz2
merged tcl 8.1 branch back into the main trunk
Diffstat (limited to 'unix/tclUnixTime.c')
-rw-r--r--unix/tclUnixTime.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index 02a1570..9427999 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.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: tclUnixTime.c,v 1.3 1999/03/10 05:52:53 stanton Exp $
+ * RCS: @(#) $Id: tclUnixTime.c,v 1.4 1999/04/16 00:48:06 stanton Exp $
*/
#include "tclInt.h"
@@ -165,12 +165,17 @@ TclpGetTimeZone (currentTime)
#if defined(HAVE_TIMEZONE_VAR) && !defined (TCL_GOT_TIMEZONE)
# define TCL_GOT_TIMEZONE
static int setTZ = 0;
+#ifdef TCL_THREADS
+ static Tcl_Mutex tzMutex;
+#endif
int timeZone;
+ Tcl_MutexLock(&tzMutex);
if (!setTZ) {
tzset();
setTZ = 1;
}
+ Tcl_MutexUnlock(&tzMutex);
/*
* Note: this is not a typo in "timezone" below! See tzset
@@ -258,7 +263,7 @@ TclpGetDate(time, useGMT)
TclpTime_t time;
int useGMT;
{
- const time_t *tp = (const time_t *)time;
+ CONST time_t *tp = (CONST time_t *)time;
if (useGMT) {
return gmtime(tp);
@@ -270,7 +275,7 @@ TclpGetDate(time, useGMT)
/*
*----------------------------------------------------------------------
*
- * TclStrftime --
+ * TclpStrftime --
*
* On Unix, we can safely call the native strftime implementation.
*
@@ -284,11 +289,11 @@ TclpGetDate(time, useGMT)
*/
size_t
-TclStrftime(s, maxsize, format, t)
+TclpStrftime(s, maxsize, format, t)
char *s;
size_t maxsize;
- const char *format;
- const struct tm *t;
+ CONST char *format;
+ CONST struct tm *t;
{
return strftime(s, maxsize, format, t);
}