diff options
| author | Jim Meyering <jim@meyering.net> | 2004-01-21 20:42:20 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2004-01-21 20:42:20 +0000 |
| commit | 7589bf42acb97a439725c9e98766d2d77823e737 (patch) | |
| tree | ac4c208bc0b996f2c307c3db509ae1344ba77c2a | |
| parent | ef7abf21eecfc98d9ccae909466971aefcbe35a1 (diff) | |
| download | coreutils-7589bf42acb97a439725c9e98766d2d77823e737.tar.xz | |
(__mktime_internal) [!_LIBC]: Define to mktime_internal
so as not to conflict with a different-sized __mktime_internal
function in GNU libc.
| -rw-r--r-- | lib/mktime.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/mktime.c b/lib/mktime.c index 3dab58ad8..9bf5c3113 100644 --- a/lib/mktime.c +++ b/lib/mktime.c @@ -1,5 +1,5 @@ /* Convert a `struct tm' to a time_t value. - Copyright (C) 1993-1999, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert (eggert@twinsun.com). @@ -108,6 +108,7 @@ const unsigned short int __mon_yday[2][13] = # include "time_r.h" # undef __localtime_r # define __localtime_r localtime_r +# define __mktime_internal mktime_internal #endif /* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) - @@ -230,7 +231,8 @@ ranged_convert (struct tm *(*convert) (const time_t *, struct tm *), the monotonic and mostly-unit-linear conversion function CONVERT. Use *OFFSET to keep track of a guess at the offset of the result, compared to what the result would be for UTC without leap seconds. - If *OFFSET's guess is correct, only one CONVERT call is needed. */ + If *OFFSET's guess is correct, only one CONVERT call is needed. + This function has global scope because it is used also by timegm.c. */ time_t __mktime_internal (struct tm *tp, struct tm *(*convert) (const time_t *, struct tm *), |