Disable assertion that fails on NetBSD 5 / i386.

diff --git a/ChangeLog b/ChangeLog
index c3ec47e33bc232d0554d2bcab191d6150d4cc976..ed376a0a26473126f1f5a957c4aa11b8c8c180a3 100644 (file)
--- 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

diff --git a/lib/mktime.c b/lib/mktime.c
index f9e7b6071c490c1fab5cc0ea922d49dc3a390487..a42c771542023520f20b6a984e35d49f17dafc83 100644 (file)
--- 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 @@ 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.  */