diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-07-08 00:44:35 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-07-08 00:44:35 +0000 |
| commit | 9c2322bc08c01e34c7488ef12c1d1bf26097190b (patch) | |
| tree | ec433de31ad6b94ffc5b422c95fcefb9895fd571 /time/strftime.c | |
| parent | 762a2918eee55943319f2c81f35257d59450ad5b (diff) | |
| download | glibc-9c2322bc08c01e34c7488ef12c1d1bf26097190b.tar.gz glibc-9c2322bc08c01e34c7488ef12c1d1bf26097190b.tar.xz glibc-9c2322bc08c01e34c7488ef12c1d1bf26097190b.zip | |
Update. cvs/libc-ud-970707
1997-07-08 02:18 Ulrich Drepper <drepper@cygnus.com> * io/lockf.c (lockf): Clear fl before using. Patch by sr@adb.fr. * libio/strops.c: Correctly handle _IO_write_end. * nss/libnss_files.map: Add __nss_netgroup_parseline. * nss/nss_files/files-netgroup.c (_nss_netgroup_parseline): Don't panic if setnetgrent wasn't called before, return error. Patch by Thorsten Kukuk <kukuk@uni-paderborn.de>. * time/mktime.c: Define localtime_r function as my_mktime_localtime_r if locally defined. * time/strftime.c: Define localtime_r function as my_ftime_localtime_r if locally defined. Define tm_diff function as ftime_tm_diff if locally defined. Reported by Richard Stallman <rms@gnu.ai.mit.edu>.
Diffstat (limited to 'time/strftime.c')
| -rw-r--r-- | time/strftime.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/time/strftime.c b/time/strftime.c index 7dbddeabf6..c380417055 100644 --- a/time/strftime.c +++ b/time/strftime.c @@ -155,7 +155,7 @@ gmtime_r (t, tp) # endif /* ! HAVE_TM_GMTOFF */ /* Approximate localtime_r as best we can in its absence. */ -# define localtime_r my_localtime_r +# define localtime_r my_ftime_localtime_r static struct tm *localtime_r __P ((const time_t *, struct tm *)); static struct tm * localtime_r (t, tp) @@ -287,6 +287,7 @@ memcpy_uppcase (dest, src, len) #if ! HAVE_TM_GMTOFF /* Yield the difference between *A and *B, measured in seconds, ignoring leap seconds. */ +# define tm_diff ftime_tm_diff static int tm_diff __P ((const struct tm *, const struct tm *)); static int tm_diff (a, b) |