Mercurial > emacs
changeset 20356:a9699fed520b
automatically generated from GPLed version
| author | Ulrich Drepper <drepper@redhat.com> |
|---|---|
| date | Wed, 26 Nov 1997 05:04:06 +0000 |
| parents | 41e0ec95fdef |
| children | d8c4a70454f2 |
| files | src/strftime.c |
| diffstat | 1 files changed, 7 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/strftime.c Tue Nov 25 22:24:13 1997 +0000 +++ b/src/strftime.c Wed Nov 26 05:04:06 1997 +0000 @@ -377,14 +377,6 @@ #ifdef emacs # define my_strftime emacs_strftime - /* Emacs 20.2 uses `-Dstrftime=emacs_strftime' when compiling, - because that's how strftime used to be configured. - Undo this, since it gets in the way of accessing the underlying strftime, - which is needed for things like %Ec in Solaris. - The following two lines can be removed once Emacs stops compiling with - `-Dstrftime=emacs_strftime'. */ -# undef strftime -size_t strftime __P ((char *, size_t, const char *, const struct tm *)); #else # define my_strftime strftime #endif @@ -1175,14 +1167,14 @@ valid time_t value. Check whether an error really occurred. */ struct tm tm; - localtime_r (<, &tm); - if ((ltm.tm_sec ^ tm.tm_sec) - | (ltm.tm_min ^ tm.tm_min) - | (ltm.tm_hour ^ tm.tm_hour) - | (ltm.tm_mday ^ tm.tm_mday) - | (ltm.tm_mon ^ tm.tm_mon) - | (ltm.tm_year ^ tm.tm_year)) + if (! localtime_r (<, &tm) + || ((ltm.tm_sec ^ tm.tm_sec) + | (ltm.tm_min ^ tm.tm_min) + | (ltm.tm_hour ^ tm.tm_hour) + | (ltm.tm_mday ^ tm.tm_mday) + | (ltm.tm_mon ^ tm.tm_mon) + | (ltm.tm_year ^ tm.tm_year))) break; }