|
 |
fc2570a |
--- modes/dclock.c.orig 2012-01-23 13:19:21.000000000 +0000
|
|
|
fc2570a |
+++ modes/dclock.c
|
|
|
fc2570a |
@@ -376,11 +376,11 @@ static dclockstruct *dclocks = (dclockst
|
|
|
fc2570a |
extern char *message;
|
|
|
fc2570a |
|
|
|
fc2570a |
static unsigned long
|
|
|
fc2570a |
-timeAtLastNewYear(long timeNow)
|
|
|
fc2570a |
+timeAtLastNewYear(time_t timeNow)
|
|
|
fc2570a |
{
|
|
|
fc2570a |
struct tm *t;
|
|
|
fc2570a |
|
|
|
fc2570a |
- t = localtime((const time_t *) &timeNow);
|
|
|
fc2570a |
+ t = localtime(&timeNow);
|
|
|
fc2570a |
return (unsigned long)(t->tm_year);
|
|
|
fc2570a |
}
|
|
|
fc2570a |
|
|
|
fc2570a |
@@ -420,7 +420,7 @@ convert(double x, char *string)
|
|
|
fc2570a |
}
|
|
|
fc2570a |
|
|
|
fc2570a |
static void
|
|
|
fc2570a |
-dayhrminsec(long timeCount, int tzoffset, char *string)
|
|
|
fc2570a |
+dayhrminsec(time_t timeCount, int tzoffset, char *string)
|
|
|
fc2570a |
{
|
|
|
fc2570a |
int days, hours, minutes, secs;
|
|
|
fc2570a |
int bufsize, i;
|
|
|
fc2570a |
@@ -675,7 +675,7 @@ drawDclock(ModeInfo * mi)
|
|
|
fc2570a |
"%a %b %d %Y", localtime(&(dp->timeold)));
|
|
|
fc2570a |
}
|
|
|
fc2570a |
} else {
|
|
|
fc2570a |
- long timeNow, timeLocal;
|
|
|
fc2570a |
+ time_t timeNow, timeLocal;
|
|
|
fc2570a |
timeNow = seconds();
|
|
|
fc2570a |
timeLocal = timeNow + dp->tzoffset;
|
|
|
fc2570a |
|
|
|
fc2570a |
@@ -950,7 +950,7 @@ init_dclock(ModeInfo * mi)
|
|
|
fc2570a |
{
|
|
|
fc2570a |
Display *display = MI_DISPLAY(mi);
|
|
|
fc2570a |
dclockstruct *dp;
|
|
|
fc2570a |
- long timeNow, timeLocal;
|
|
|
fc2570a |
+ time_t timeNow, timeLocal;
|
|
|
fc2570a |
int i, j;
|
|
|
fc2570a |
|
|
|
fc2570a |
if (dclocks == NULL) {
|
|
|
fc2570a |
@@ -1252,7 +1252,7 @@ defined(MODE_dclock_mayan)
|
|
|
fc2570a |
dayhrminsec(MAYAN_TIME_START - timeLocal, dp->tzoffset, dp->strnew[1]);
|
|
|
fc2570a |
dp->strpta[1] = dp->strnew[1];
|
|
|
fc2570a |
} else {
|
|
|
fc2570a |
- struct tm *t = localtime((const time_t *) &timeLocal);
|
|
|
fc2570a |
+ struct tm *t = localtime(&timeLocal);
|
|
|
fc2570a |
|
|
|
fc2570a |
if (dp->time24)
|
|
|
fc2570a |
(void) strftime(dp->strnew[0], STRSIZE, "%H:%M:%S", t);
|
|
|
fc2570a |
|