# HG changeset patch # User Paul Eggert # Date 1296259033 28800 # Node ID 36eacd15d26acda4a4abf8a91fd58be1bcd397e6 # Parent f2c6946affe2df591ee04c3a1c584a2b5bdc068f mktime: fix misspelling in comment * lib/mktime.c (__mktime_internal): Fix misspelling in comment. This merges all recent glibc changes of importance. diff --git a/ChangeLog b/ChangeLog --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-01-28 Paul Eggert + + mktime: fix misspelling in comment + * lib/mktime.c (__mktime_internal): Fix misspelling in comment. + This merges all recent glibc changes of importance. + 2011-01-28 Ralf Wildenhues move-if-change: cope with concurrent mv of identical file. diff --git a/lib/mktime.c b/lib/mktime.c --- a/lib/mktime.c +++ b/lib/mktime.c @@ -375,7 +375,7 @@ int diff = approx_biennia - approx_requested_biennia; int abs_diff = diff < 0 ? - diff : diff; - /* IRIX 4.0.5 cc miscaculates TIME_T_MIN / 3: it erroneously + /* IRIX 4.0.5 cc miscalculates TIME_T_MIN / 3: it erroneously gives a positive value of 715827882. Setting a variable first then doing math on it seems to work. (ghazi@caip.rutgers.edu) */