Module Name: src
Committed By: christos
Date: Fri Oct 30 18:04:42 UTC 2015
Modified Files:
src/lib/libc/time: strptime.c
Log Message:
revert timezone() ifdef; it is wrong (pointed out by ginsbach)
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/lib/libc/time/strptime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/time/strptime.c
diff -u src/lib/libc/time/strptime.c:1.53 src/lib/libc/time/strptime.c:1.54
--- src/lib/libc/time/strptime.c:1.53 Thu Oct 29 23:18:10 2015
+++ src/lib/libc/time/strptime.c Fri Oct 30 14:04:42 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: strptime.c,v 1.53 2015/10/30 03:18:10 ginsbach Exp $ */
+/* $NetBSD: strptime.c,v 1.54 2015/10/30 18:04:42 christos Exp $ */
/*-
* Copyright (c) 1997, 1998, 2005, 2008 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: strptime.c,v 1.53 2015/10/30 03:18:10 ginsbach Exp $");
+__RCSID("$NetBSD: strptime.c,v 1.54 2015/10/30 18:04:42 christos Exp $");
#endif
#include "namespace.h"
@@ -467,10 +467,7 @@ literal:
if (ep != NULL) {
tm->tm_isdst = i;
#ifdef TM_GMTOFF
-#ifdef USG_COMPAT
tm->TM_GMTOFF = -timezone;
-#else
- tm->TM_GMTOFF = -timezone();
#endif
#endif
#ifdef TM_ZONE
