summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorPaul Janzen <pjanzen@cvs.openbsd.org>1999-03-09 23:06:13 +0000
committerPaul Janzen <pjanzen@cvs.openbsd.org>1999-03-09 23:06:13 +0000
commit56c7fa6704da8e2d272cd64ea3574bedeaf9ef5b (patch)
tree82d389fb6a49606431e3c620478fa88245f89f4e /lib
parent9e4b8d7d130c8e5f80af2f6bca11385b88002d00 (diff)
Back out rev 1.7. PCTS 151-2 still passes, and mktime() now correctly returns
-1 for calendar times that cannot be represented.
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/time/localtime.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/libc/time/localtime.c b/lib/libc/time/localtime.c
index 4f35f32ebcc..7ce35ed6ac1 100644
--- a/lib/libc/time/localtime.c
+++ b/lib/libc/time/localtime.c
@@ -5,7 +5,7 @@
#if defined(LIBC_SCCS) && !defined(lint) && !defined(NOID)
static char elsieid[] = "@(#)localtime.c 7.66";
-static char rcsid[] = "$OpenBSD: localtime.c,v 1.16 1999/02/02 00:22:42 d Exp $";
+static char rcsid[] = "$OpenBSD: localtime.c,v 1.17 1999/03/09 23:06:12 pjanzen Exp $";
#endif /* LIBC_SCCS and not lint */
/*
@@ -1433,14 +1433,7 @@ const int do_norm_secs;
dir = tmcomp(&mytm, &yourtm);
if (dir != 0) {
if (bits-- < 0)
-#ifdef PCTS
- {
- t += 2;
- break;
- }
-#else
return WRONG;
-#endif
if (bits < 0)
--t; /* may be needed if new t is minimal */
else if (dir > 0)