Mercurial > hg > octave-nkf > gnulib-hg
changeset 11999:9e192c655ff0
Disable assertion that fails on NetBSD 5 / i386.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Thu, 17 Sep 2009 08:07:50 +0200 |
parents | 16bd0021aea2 |
children | dc5b8cafce92 |
files | ChangeLog lib/mktime.c |
diffstat | 2 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-09-17 Bruno Haible <bruno@clisp.org> + + Disable assertion that fails on NetBSD 5 / i386. + * lib/mktime.c (ydhms_diff): Disable assertion about time_t size. + Reported by Sam Steingold <sds@gnu.org> + and Hasso Tepper <hasso@netbsd.org>. + 2009-09-16 Eric Blake <ebb9@byu.net> unlinkdir: port to mingw
--- 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-2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 1993-1999, 2002-2007, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Paul Eggert <eggert@twinsun.com>. @@ -165,8 +165,11 @@ int year0, int yday0, int hour0, int min0, int sec0) { verify (C99_integer_division, -1 / 2 == 0); +#if 0 /* This assertion fails on 32-bit systems with 64-bit time_t, such as + NetBSD 5 on i386. */ verify (long_int_year_and_yday_are_wide_enough, INT_MAX <= LONG_MAX / 2 || TIME_T_MAX <= UINT_MAX); +#endif /* Compute intervening leap days correctly even if year is negative. Take care to avoid integer overflow here. */