From c9f0e4483fea327e4982c28dc0e5cd7bd5e48f77 Mon Sep 17 00:00:00 2001 From: tg Date: Fri, 31 Dec 2004 19:15:39 +0000 Subject: [PATCH] kill a local include file --- c_ulimit.c | 6 +++--- ksh_time.h | 28 ---------------------------- main.c | 6 +++--- var.c | 6 +++--- 4 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 ksh_time.h diff --git a/c_ulimit.c b/c_ulimit.c index 663aafa..a422e3f 100644 --- a/c_ulimit.c +++ b/c_ulimit.c @@ -1,4 +1,4 @@ -/** $MirBSD: src/bin/ksh/c_ulimit.c,v 2.1 2004/12/10 18:09:41 tg Exp $ */ +/** $MirBSD: src/bin/ksh/c_ulimit.c,v 2.2 2004/12/31 19:15:39 tg Exp $ */ /* $OpenBSD: c_ulimit.c,v 1.10 2003/10/22 07:40:38 jmc Exp $ */ /* @@ -20,7 +20,7 @@ */ #include "sh.h" -#include "ksh_time.h" +#include #ifdef HAVE_SYS_RESOURCE_H # include #endif /* HAVE_SYS_RESOURCE_H */ @@ -32,7 +32,7 @@ extern long ulimit(); # endif /* HAVE_ULIMIT */ #endif /* HAVE_ULIMIT_H */ -__RCSID("$MirBSD: src/bin/ksh/c_ulimit.c,v 2.1 2004/12/10 18:09:41 tg Exp $"); +__RCSID("$MirBSD: src/bin/ksh/c_ulimit.c,v 2.2 2004/12/31 19:15:39 tg Exp $"); #define SOFT 0x1 #define HARD 0x2 diff --git a/ksh_time.h b/ksh_time.h deleted file mode 100644 index c9aa3de..0000000 --- a/ksh_time.h +++ /dev/null @@ -1,28 +0,0 @@ -/** $MirBSD: src/bin/ksh/ksh_time.h,v 2.1 2004/12/10 18:09:41 tg Exp $ */ -/* $OpenBSD: ksh_time.h,v 1.2 1996/10/01 02:05:40 downsj Exp $ */ - -#ifndef KSH_TIME_H -#define KSH_TIME_H - -/* Wrapper around the ugly time.h,sys/time.h includes/ifdefs */ - -#ifdef TIME_WITH_SYS_TIME -# include -# include -#else /* TIME_WITH_SYS_TIME */ -# ifdef HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif /* TIME_WITH_SYS_TIME */ - -#ifndef TIME_DECLARED -extern time_t time(time_t *); -#endif - -#ifndef CLK_TCK -# define CLK_TCK 60 /* 60HZ */ -#endif - -#endif /* KSH_TIME_H */ diff --git a/main.c b/main.c index 483377c..b73d3c7 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/** $MirBSD: src/bin/ksh/main.c,v 2.14 2004/12/31 17:15:07 tg Exp $ */ +/** $MirBSD: src/bin/ksh/main.c,v 2.15 2004/12/31 19:15:39 tg Exp $ */ /* $OpenBSD: main.c,v 1.35 2004/12/22 18:57:28 otto Exp $ */ /* @@ -9,13 +9,13 @@ #include "sh.h" #include "ksh_stat.h" -#include "ksh_time.h" +#include /* * shell version */ -__RCSID("$MirBSD: src/bin/ksh/main.c,v 2.14 2004/12/31 17:15:07 tg Exp $"); +__RCSID("$MirBSD: src/bin/ksh/main.c,v 2.15 2004/12/31 19:15:39 tg Exp $"); const char ksh_version[] = "@(#)PD KSH v5.2.14 MirOS R20 in " diff --git a/var.c b/var.c index 04dab5f..124db30 100644 --- a/var.c +++ b/var.c @@ -1,13 +1,13 @@ -/** $MirBSD: src/bin/ksh/var.c,v 2.6 2004/12/28 22:32:08 tg Exp $ */ +/** $MirBSD: src/bin/ksh/var.c,v 2.7 2004/12/31 19:15:39 tg Exp $ */ /* $OpenBSD: var.c,v 1.17 2004/05/08 19:42:35 deraadt Exp $ */ #include "sh.h" -#include "ksh_time.h" +#include #include "ksh_limval.h" #include "ksh_stat.h" #include -__RCSID("$MirBSD: src/bin/ksh/var.c,v 2.6 2004/12/28 22:32:08 tg Exp $"); +__RCSID("$MirBSD: src/bin/ksh/var.c,v 2.7 2004/12/31 19:15:39 tg Exp $"); /* * Variables