Module Name: src
Committed By: dholland
Date: Sun Jan 27 04:38:38 UTC 2019
Modified Files:
src/lib/libc/time: difftime.c localtime.c
Log Message:
fix duplicated chunk from merge
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/time/difftime.c
cvs rdiff -u -r1.115 -r1.116 src/lib/libc/time/localtime.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/difftime.c
diff -u src/lib/libc/time/difftime.c:1.20 src/lib/libc/time/difftime.c:1.21
--- src/lib/libc/time/difftime.c:1.20 Sun Jan 27 02:08:35 2019
+++ src/lib/libc/time/difftime.c Sun Jan 27 04:38:38 2019
@@ -1,6 +1,4 @@
-/* $NetBSD: difftime.c,v 1.20 2019/01/27 02:08:35 pgoyette Exp $ */
-
-/* Return the difference between two timestamps. */
+/* $NetBSD: difftime.c,v 1.21 2019/01/27 04:38:38 dholland Exp $ */
/* Return the difference between two timestamps. */
@@ -14,7 +12,7 @@
#if 0
static char elsieid[] = "@(#)difftime.c 8.1";
#else
-__RCSID("$NetBSD: difftime.c,v 1.20 2019/01/27 02:08:35 pgoyette Exp $");
+__RCSID("$NetBSD: difftime.c,v 1.21 2019/01/27 04:38:38 dholland Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
Index: src/lib/libc/time/localtime.c
diff -u src/lib/libc/time/localtime.c:1.115 src/lib/libc/time/localtime.c:1.116
--- src/lib/libc/time/localtime.c:1.115 Sun Jan 27 02:08:35 2019
+++ src/lib/libc/time/localtime.c Sun Jan 27 04:38:38 2019
@@ -1,6 +1,4 @@
-/* $NetBSD: localtime.c,v 1.115 2019/01/27 02:08:35 pgoyette Exp $ */
-
-/* Convert timestamp from time_t to struct tm. */
+/* $NetBSD: localtime.c,v 1.116 2019/01/27 04:38:38 dholland Exp $ */
/* Convert timestamp from time_t to struct tm. */
@@ -14,7 +12,7 @@
#if 0
static char elsieid[] = "@(#)localtime.c 8.17";
#else
-__RCSID("$NetBSD: localtime.c,v 1.115 2019/01/27 02:08:35 pgoyette Exp $");
+__RCSID("$NetBSD: localtime.c,v 1.116 2019/01/27 04:38:38 dholland Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
