2000-03-10 12:31:34 +00:00
|
|
|
--- interp.c.orig Mon May 11 20:43:36 1992
|
|
|
|
|
+++ interp.c Fri Mar 10 13:23:29 2000
|
1999-04-25 17:58:21 +00:00
|
|
|
@@ -476,7 +476,7 @@
|
|
|
|
|
dodts(mo, day, yr)
|
|
|
|
|
int mo, day, yr;
|
|
|
|
|
{
|
|
|
|
|
- long trial;
|
|
|
|
|
+ time_t trial;
|
|
|
|
|
register struct tm *tp;
|
|
|
|
|
register int i;
|
|
|
|
|
register long jdate;
|
2000-03-10 12:31:34 +00:00
|
|
|
@@ -484,7 +484,7 @@
|
|
|
|
|
mdays[1] = 28 + (yr%4 == 0);
|
|
|
|
|
|
|
|
|
|
if (mo < 1 || mo > 12 || day < 1 || day > mdays[--mo] ||
|
|
|
|
|
- yr > 1999 || yr < 1970) {
|
|
|
|
|
+ yr > 2099 || yr < 1970) {
|
|
|
|
|
error("@dts: invalid argument");
|
|
|
|
|
cellerror = CELLERROR;
|
|
|
|
|
return(0.0);
|
1999-04-25 17:58:21 +00:00
|
|
|
@@ -551,15 +551,13 @@
|
|
|
|
|
int which;
|
|
|
|
|
double when;
|
|
|
|
|
{
|
|
|
|
|
- long time();
|
|
|
|
|
-
|
|
|
|
|
static long t_cache;
|
|
|
|
|
static struct tm tm_cache;
|
|
|
|
|
struct tm *tp;
|
|
|
|
|
- long tloc;
|
|
|
|
|
+ time_t tloc;
|
|
|
|
|
|
|
|
|
|
if (which == NOW)
|
|
|
|
|
- return (double)time((long *)0);
|
|
|
|
|
+ return (double)time(NULL);
|
|
|
|
|
|
|
|
|
|
tloc = (long)when;
|
|
|
|
|
|
