From: Bruno Haible Date: Thu, 17 Sep 2009 06:07:50 +0000 (+0200) Subject: Disable assertion that fails on NetBSD 5 / i386. X-Git-Tag: v0.1~5488 X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;ds=sidebyside;h=2b95db96091c15709cc91bf0f2306f6ba6d898bb;p=gnulib.git Disable assertion that fails on NetBSD 5 / i386. --- diff --git a/ChangeLog b/ChangeLog index c3ec47e33..ed376a0a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-09-17 Bruno Haible + + Disable assertion that fails on NetBSD 5 / i386. + * lib/mktime.c (ydhms_diff): Disable assertion about time_t size. + Reported by Sam Steingold + and Hasso Tepper . + 2009-09-16 Eric Blake unlinkdir: port to mingw diff --git a/lib/mktime.c b/lib/mktime.c index f9e7b6071..a42c77154 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-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 . @@ -165,8 +165,11 @@ ydhms_diff (long int year1, long int yday1, int hour1, int min1, int sec1, 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. */