diff options
| -rw-r--r-- | bin/ksh/PROJECTS | 5 | ||||
| -rw-r--r-- | bin/ksh/ksh_limval.h | 9 | ||||
| -rw-r--r-- | bin/ksh/sh.h | 4 | ||||
| -rw-r--r-- | bin/ksh/shf.c | 3 | ||||
| -rw-r--r-- | bin/ksh/var.c | 3 |
5 files changed, 6 insertions, 18 deletions
diff --git a/bin/ksh/PROJECTS b/bin/ksh/PROJECTS index 61a1c91d00b..0be0e85ac15 100644 --- a/bin/ksh/PROJECTS +++ b/bin/ksh/PROJECTS @@ -1,4 +1,4 @@ -$OpenBSD: PROJECTS,v 1.7 2013/11/28 10:33:37 sobrado Exp $ +$OpenBSD: PROJECTS,v 1.8 2015/09/14 09:42:33 nicm Exp $ Things to be done in pdksh (see also the NOTES file): @@ -109,6 +109,3 @@ Things to be done in pdksh (see also the NOTES file): * teach shf_vfprintf() about long long's (%lld); also make %p use long longs if appropriate. - - * decide wether to keep currently disabled FP stuff in shf.c; if - not, eliminate ksh_limval.h (moving BITS to var.c). diff --git a/bin/ksh/ksh_limval.h b/bin/ksh/ksh_limval.h deleted file mode 100644 index 554955d440b..00000000000 --- a/bin/ksh/ksh_limval.h +++ /dev/null @@ -1,9 +0,0 @@ -/* $OpenBSD: ksh_limval.h,v 1.3 2015/09/13 19:43:42 tedu Exp $ */ - -/* Wrapper around the values.h/limits.h includes/ifdefs */ - -/* limits.h is included in sh.h */ - -#ifndef BITS -# define BITS(t) (CHAR_BIT * sizeof(t)) -#endif diff --git a/bin/ksh/sh.h b/bin/ksh/sh.h index 7f471c42071..c15c2109c6f 100644 --- a/bin/ksh/sh.h +++ b/bin/ksh/sh.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sh.h,v 1.35 2015/09/10 22:48:58 nicm Exp $ */ +/* $OpenBSD: sh.h,v 1.36 2015/09/14 09:42:33 nicm Exp $ */ /* * Public Domain Bourne/Korn shell @@ -52,6 +52,8 @@ typedef int Tflag; #define NUFILE 32 /* Number of user-accessible files */ #define FDBASE 10 /* First file usable by Shell */ +#define BITS(t) (CHAR_BIT * sizeof(t)) + /* Make MAGIC a char that might be printed to make bugs more obvious, but * not a char that is used often. Also, can't use the high bit as it causes * portability problems (calling strchr(x, 0x80|'x') is error prone). diff --git a/bin/ksh/shf.c b/bin/ksh/shf.c index b676537da84..e2eff8a7d44 100644 --- a/bin/ksh/shf.c +++ b/bin/ksh/shf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: shf.c,v 1.17 2015/09/13 19:43:42 tedu Exp $ */ +/* $OpenBSD: shf.c,v 1.18 2015/09/14 09:42:33 nicm Exp $ */ /* * Shell file I/O routines @@ -6,7 +6,6 @@ #include "sh.h" #include <sys/stat.h> -#include "ksh_limval.h" /* flags to shf_emptybuf() */ diff --git a/bin/ksh/var.c b/bin/ksh/var.c index b6c409b249e..1afaec047d9 100644 --- a/bin/ksh/var.c +++ b/bin/ksh/var.c @@ -1,8 +1,7 @@ -/* $OpenBSD: var.c,v 1.44 2015/09/10 11:37:42 jca Exp $ */ +/* $OpenBSD: var.c,v 1.45 2015/09/14 09:42:33 nicm Exp $ */ #include "sh.h" #include <time.h> -#include "ksh_limval.h" #include <sys/stat.h> #include <ctype.h> |