Ensure we use gnulib mktime rather than glibc's mktime, on hosts

[pspp] / lib / mktime.c

diff --git a/lib/mktime.c b/lib/mktime.c
index a4f4e3bfd5630100836987899ee2ebc928e9dd25..107dbbf36f75b1254d9d47e19b09f93a62b0a2e6 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 Free Software Foundation, Inc.
+   Copyright (C) 1993-1999, 2002, 2003 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Paul Eggert (eggert@twinsun.com).
 
@@ -264,12 +264,6 @@ __mktime_internal (struct tm *tp,
 
   int sec_requested = sec;
 
-  /* Only years after 1970 are defined.
-     If year is 69, it might still be representable due to
-     timezone differences.  */
-  if (year < 69)
-    return -1;
-
 #if LEAP_SECONDS_POSSIBLE
   /* Handle out-of-range seconds specially,
      since ydhms_tm_diff assumes every minute has 60 seconds.  */
@@ -377,14 +371,6 @@ __mktime_internal (struct tm *tp,
        return -1;
     }
 
-  if (year == 69)
-    {
-      /* If year was 69, need to check whether the time was representable
-        or not.  */
-      if (t < 0 || t > 2 * 24 * 60 * 60)
-       return -1;
-    }
-
   *tp = tm;
   return t;
 }