diff options
| -rw-r--r-- | contrib/texinfo/makeinfo/makeinfo.c | 10 | ||||
| -rw-r--r-- | usr.bin/touch/touch.c | 8 |
2 files changed, 8 insertions, 10 deletions
diff --git a/contrib/texinfo/makeinfo/makeinfo.c b/contrib/texinfo/makeinfo/makeinfo.c index 2ed9365..f30d366 100644 --- a/contrib/texinfo/makeinfo/makeinfo.c +++ b/contrib/texinfo/makeinfo/makeinfo.c @@ -3918,12 +3918,6 @@ cm_dotless (arg, start, end) } } -#if defined (__osf__) -#define LOCALTIME_CAST(x) (time_t *)(x) -#else -#define LOCALTIME_CAST(x) (x) -#endif - void cm_today (arg) int arg; @@ -3933,8 +3927,8 @@ cm_today (arg) "August", "September", "October", "November", "December" }; if (arg == START) { - long timer = time (0); - struct tm *ts = localtime (LOCALTIME_CAST (&timer)); + time_t timer = time (0); + struct tm *ts = localtime (&timer); add_word_args ("%d %s %d", (ts -> tm_mday), diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index 32a7319..712d72e 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -184,11 +184,13 @@ stime_arg1(arg, tvp) char *arg; struct timeval *tvp; { + time_t now; struct tm *t; int yearset; char *p; /* Start with the current time. */ - if ((t = localtime(&tvp[0].tv_sec)) == NULL) + now = tvp[0].tv_sec; + if ((t = localtime(&now)) == NULL) err(1, "localtime"); /* [[CC]YY]MMDDhhmm[.SS] */ if ((p = strchr(arg, '.')) == NULL) @@ -246,9 +248,11 @@ stime_arg2(arg, year, tvp) int year; struct timeval *tvp; { + time_t now; struct tm *t; /* Start with the current time. */ - if ((t = localtime(&tvp[0].tv_sec)) == NULL) + now = tvp[0].tv_sec; + if ((t = localtime(&now)) == NULL) err(1, "localtime"); t->tm_mon = ATOI2(arg); /* MMDDhhmm[yy] */ |
