From 656dcd4316d328f627e3c8f99be96bb2c41baf5b Mon Sep 17 00:00:00 2001
From: Garrett Wollman <wollman@FreeBSD.org>
Date: Mon, 7 Aug 1995 19:17:46 +0000
Subject: Delete bogus referneces to timezone code internal header file
 `tzfile.h', which is no longer bogusly installed in /usr/include.

---
 bin/ls/print.c     | 5 ++---
 bin/pax/gen_subs.c | 5 ++---
 bin/ps/print.c     | 7 +++----
 3 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'bin')

diff --git a/bin/ls/print.c b/bin/ls/print.c
index d0e6c16375423..03b928853c1ce 100644
--- a/bin/ls/print.c
+++ b/bin/ls/print.c
@@ -33,7 +33,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: print.c,v 1.3 1995/03/19 13:28:46 joerg Exp $
+ *	$Id: print.c,v 1.4 1995/05/30 00:06:50 rgrimes Exp $
  */
 
 #ifndef lint
@@ -52,7 +52,6 @@ static char sccsid[] = "@(#)print.c	8.4 (Berkeley) 4/17/94";
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#include <tzfile.h>
 #include <unistd.h>
 #include <utmp.h>
 
@@ -234,7 +233,7 @@ printtime(ftime)
 	for (i = 4; i < 11; ++i)
 		(void)putchar(longstring[i]);
 
-#define	SIXMONTHS	((DAYSPERNYEAR / 2) * SECSPERDAY)
+#define	SIXMONTHS	((365 / 2) * 86400)
 	if (f_sectime)
 		for (i = 11; i < 24; i++)
 			(void)putchar(longstring[i]);
diff --git a/bin/pax/gen_subs.c b/bin/pax/gen_subs.c
index 42be017b05f1c..2d228fc362aed 100644
--- a/bin/pax/gen_subs.c
+++ b/bin/pax/gen_subs.c
@@ -34,7 +34,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: gen_subs.c,v 1.3 1995/03/19 13:28:49 joerg Exp $
+ *	$Id: gen_subs.c,v 1.4 1995/05/30 00:06:58 rgrimes Exp $
  */
 
 #ifndef lint
@@ -47,7 +47,6 @@ static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
 #include <sys/param.h>
 #include <stdio.h>
 #include <ctype.h>
-#include <tzfile.h>
 #include <utmp.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -64,7 +63,7 @@ static char sccsid[] = "@(#)gen_subs.c	8.1 (Berkeley) 5/31/93";
  */
 #define MODELEN 20
 #define DATELEN 64
-#define SIXMONTHS	 ((DAYSPERNYEAR / 2) * SECSPERDAY)
+#define SIXMONTHS	 ((365 / 2) * 86400)
 #define CURFRMT		"%b %e %H:%M"
 #define OLDFRMT		"%b %e  %Y"
 #ifndef UT_NAMESIZE
diff --git a/bin/ps/print.c b/bin/ps/print.c
index 8085f48653332..cf042d7aa024c 100644
--- a/bin/ps/print.c
+++ b/bin/ps/print.c
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id: print.c,v 1.6 1995/03/19 13:29:01 joerg Exp $
+ *	$Id: print.c,v 1.7 1995/05/30 00:07:04 rgrimes Exp $
  */
 
 #ifndef lint
@@ -65,7 +65,6 @@ static char sccsid[] = "@(#)print.c	8.6 (Berkeley) 4/16/94";
 #include <stdlib.h>
 #include <string.h>
 #include <vis.h>
-#include <tzfile.h>
 
 #include "ps.h"
 
@@ -369,11 +368,11 @@ started(k, ve)
 	tp = localtime(&k->ki_u.u_start.tv_sec);
 	if (!now)
 		(void)time(&now);
-	if (now - k->ki_u.u_start.tv_sec < 24 * SECSPERHOUR) {
+	if (now - k->ki_u.u_start.tv_sec < 24 * 3600) {
 		/* I *hate* SCCS... */
 		static char fmt[] = __CONCAT("%l:%", "M%p");
 		(void)strftime(buf, sizeof(buf) - 1, fmt, tp);
-	} else if (now - k->ki_u.u_start.tv_sec < 7 * SECSPERDAY) {
+	} else if (now - k->ki_u.u_start.tv_sec < 7 * 86400) {
 		/* I *hate* SCCS... */
 		static char fmt[] = __CONCAT("%a%", "I%p");
 		(void)strftime(buf, sizeof(buf) - 1, fmt, tp);
-- 
cgit v1.3