summaryrefslogtreecommitdiffstats
path: root/unix/tclUnixTime.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-09-05 13:45:15 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-09-05 13:45:15 (GMT)
commit1f6ac7f87e3a127645d7839916f0bc2a6143b9b9 (patch)
treeebd9cd2ef1306351bac09ce6e0c22872ad04d953 /unix/tclUnixTime.c
parent2562ea174bddf62331bd7d71ebd4b49f53ad8345 (diff)
parent5c9968a001208bb4fc6d06ad040c28bd84b7831f (diff)
downloadtcl-1f6ac7f87e3a127645d7839916f0bc2a6143b9b9.zip
tcl-1f6ac7f87e3a127645d7839916f0bc2a6143b9b9.tar.gz
tcl-1f6ac7f87e3a127645d7839916f0bc2a6143b9b9.tar.bz2
Merge 8.7.
Change some internal function signatures, accounting for the 64-bit era.
Diffstat (limited to 'unix/tclUnixTime.c')
-rw-r--r--unix/tclUnixTime.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/unix/tclUnixTime.c b/unix/tclUnixTime.c
index 2d6560b..9ae5016 100644
--- a/unix/tclUnixTime.c
+++ b/unix/tclUnixTime.c
@@ -52,7 +52,7 @@ ClientData tclTimeClientData = NULL;
*----------------------------------------------------------------------
*/
-unsigned long
+Tcl_WideUInt
TclpGetSeconds(void)
{
return time(NULL);
@@ -77,30 +77,30 @@ TclpGetSeconds(void)
*----------------------------------------------------------------------
*/
-unsigned long
+Tcl_WideUInt
TclpGetClicks(void)
{
- unsigned long now;
+ Tcl_WideUInt now;
#ifdef NO_GETTOD
if (tclGetTimeProcPtr != NativeGetTime) {
Tcl_Time time;
tclGetTimeProcPtr(&time, tclTimeClientData);
- now = time.sec*1000000 + time.usec;
+ now = (Tcl_WideUInt)time.sec*1000000 + time.usec;
} else {
/*
* A semi-NativeGetTime, specialized to clicks.
*/
struct tms dummy;
- now = (unsigned long) times(&dummy);
+ now = (Tcl_WideUInt) times(&dummy);
}
#else
Tcl_Time time;
tclGetTimeProcPtr(&time, tclTimeClientData);
- now = time.sec*1000000 + time.usec;
+ now = (Tcl_WideUInt)time.sec*1000000 + time.usec;
#endif
return now;
@@ -113,9 +113,9 @@ TclpGetClicks(void)
* TclpGetWideClicks --
*
* This procedure returns a WideInt value that represents the highest
- * resolution clock available on the system. There are no garantees on
+ * resolution clock available on the system. There are no guarantees on
* what the resolution will be. In Tcl we will call this value a "click".
- * The start time is also system dependant.
+ * The start time is also system dependent.
*
* Results:
* Number of WideInt clicks from some start time.