diff options
| author | stanton <stanton> | 1999-03-10 05:52:45 (GMT) |
|---|---|---|
| committer | stanton <stanton> | 1999-03-10 05:52:45 (GMT) |
| commit | 0b4be24161f5971f3181adec27a32becf7cb8870 (patch) | |
| tree | 92131df26a09a5f7b28f854fb7c0a62ba26cb8ac /generic/tclDate.c | |
| parent | a5bface5b6607af37870fc5f5ee5019f6d5fb3f1 (diff) | |
| download | tcl-0b4be24161f5971f3181adec27a32becf7cb8870.zip tcl-0b4be24161f5971f3181adec27a32becf7cb8870.tar.gz tcl-0b4be24161f5971f3181adec27a32becf7cb8870.tar.bz2 | |
Merged stubs changes into mainline for 8.0
Diffstat (limited to 'generic/tclDate.c')
| -rw-r--r-- | generic/tclDate.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/generic/tclDate.c b/generic/tclDate.c index 7afe99c..eb87b76 100644 --- a/generic/tclDate.c +++ b/generic/tclDate.c @@ -10,7 +10,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclDate.c,v 1.2 1998/09/14 18:39:58 stanton Exp $ + * RCS: @(#) $Id: tclDate.c,v 1.3 1999/03/10 05:52:47 stanton Exp $ */ #include "tclInt.h" @@ -441,7 +441,7 @@ Convert(Month, Day, Year, Hours, Minutes, Seconds, Meridian, DSTmode, TimePtr) return -1; Julian += tod; if (DSTmode == DSTon - || (DSTmode == DSTmaybe && TclpGetDate(&Julian, 0)->tm_isdst)) + || (DSTmode == DSTmaybe && TclpGetDate((TclpTime_t)&Julian, 0)->tm_isdst)) Julian -= 60 * 60; *TimePtr = Julian; return 0; @@ -456,8 +456,8 @@ DSTcorrect(Start, Future) time_t StartDay; time_t FutureDay; - StartDay = (TclpGetDate(&Start, 0)->tm_hour + 1) % 24; - FutureDay = (TclpGetDate(&Future, 0)->tm_hour + 1) % 24; + StartDay = (TclpGetDate((TclpTime_t)&Start, 0)->tm_hour + 1) % 24; + FutureDay = (TclpGetDate((TclpTime_t)&Future, 0)->tm_hour + 1) % 24; return (Future - Start) + (StartDay - FutureDay) * 60L * 60L; } @@ -472,7 +472,7 @@ RelativeDate(Start, DayOrdinal, DayNumber) time_t now; now = Start; - tm = TclpGetDate(&now, 0); + tm = TclpGetDate((TclpTime_t)&now, 0); now += SECSPERDAY * ((DayNumber - tm->tm_wday + 7) % 7); now += 7 * SECSPERDAY * (DayOrdinal <= 0 ? DayOrdinal : DayOrdinal - 1); return DSTcorrect(Start, now); @@ -495,7 +495,7 @@ RelativeMonth(Start, RelMonth, TimePtr) *TimePtr = 0; return 0; } - tm = TclpGetDate(&Start, 0); + tm = TclpGetDate((TclpTime_t)&Start, 0); Month = 12 * (tm->tm_year + TM_YEAR_BASE) + tm->tm_mon + RelMonth; Year = Month / 12; Month = Month % 12 + 1; @@ -726,7 +726,7 @@ TclGetDate(p, now, zone, timePtr) int thisyear; TclDateInput = p; - tm = TclpGetDate((time_t *) &now, 0); + tm = TclpGetDate((TclpTime_t) &now, 0); thisyear = tm->tm_year + TM_YEAR_BASE; TclDateYear = thisyear; TclDateMonth = tm->tm_mon + 1; |