From: Dave Love Date: Mon, 19 Jun 2000 13:07:47 +0000 (+0000) Subject: Unprotoized. X-Git-Tag: emacs-pretest-21.0.90~3246 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=998e9f8cb3ee57ab87b9cc7eedf3e8687d4b3406;p=emacs.git Unprotoized. --- diff --git a/src/ChangeLog b/src/ChangeLog index 33a1180a509..8d90ca6889c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2000-06-19 Dave Love + + * mktime.c: Unprotoized. + 2000-06-19 Richard Stallman * data.c (set_internal): If variable is frame-local, diff --git a/src/mktime.c b/src/mktime.c index 3b3330eea06..3f36e33a235 100644 --- a/src/mktime.c +++ b/src/mktime.c @@ -117,7 +117,9 @@ const unsigned short int __mon_yday[2][13] = localtime to localtime_r, since many localtime_r implementations are buggy. */ static struct tm * -my_mktime_localtime_r (const time_t *t, struct tm *tp) +my_mktime_localtime_r (t, tp) + const time_t *t; + struct tm *tp; { struct tm *l = localtime (t); if (! l) @@ -135,8 +137,9 @@ my_mktime_localtime_r (const time_t *t, struct tm *tp) If TP is null, return a nonzero value. If overflow occurs, yield the low order bits of the correct answer. */ static time_t -ydhms_tm_diff (int year, int yday, int hour, int min, int sec, - const struct tm *tp) +ydhms_tm_diff (year, yday, hour, min, sec, tp) + int year, yday, hour, min, sec; + const struct tm *tp; { if (!tp) return 1; @@ -167,8 +170,14 @@ ydhms_tm_diff (int year, int yday, int hour, int min, int sec, If *T is out of range for conversion, adjust it so that it is the nearest in-range value and then convert that. */ static struct tm * -ranged_convert (struct tm *(*convert) (const time_t *, struct tm *), - time_t *t, struct tm *tp) +ranged_convert (convert, t, tp) +#ifdef PROTOTYPES + struct tm *(*convert) (const time_t *, struct tm *); +#else + struct tm *(*convert)(); +#endif + time_t *t; + struct tm *tp; { struct tm *r; @@ -215,9 +224,14 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *), compared to what the result would be for UTC without leap seconds. If *OFFSET's guess is correct, only one CONVERT call is needed. */ time_t -__mktime_internal (struct tm *tp, - struct tm *(*convert) (const time_t *, struct tm *), - time_t *offset) +__mktime_internal (tp, convert, offset) + struct tm *tp; +#ifdef PROTOTYPES + struct tm *(*convert) (const time_t *, struct tm *); +#else + struct tm *(*convert)(); +#endif + time_t *offset; { time_t t, dt, t0, t1, t2; struct tm tm;