create new machine/_float.h which is namespace clean. create a new

MI float.h which pulls in and defines the values that are needed from
there, and repair sys/limits.h so that it defines the values it needs
as well (depending on POSIX version, XPG version, etc).  guenther has
a more exact selection of that coming for limits.h.
this also fixes a few mistakes for the vax.
reviewed by kettenis and guenther.

2 files changed, 35 insertions, 62 deletions

diff --git a/sys/arch/vax/include/float.h b/sys/arch/vax/include/_float.h
index eec2c68c6c0..5c45065e54a 100644
--- a/sys/arch/vax/include/float.h
+++ b/sys/arch/vax/include/_float.h
@@ -1,5 +1,4 @@
-/*	$OpenBSD: float.h,v 1.9 2011/08/29 13:13:21 kettenis Exp $	*/
-/*	$NetBSD: float.h,v 1.5 1998/10/10 02:13:55 matt Exp $	*/
+/*	$OpenBSD: _float.h,v 1.1 2012/06/26 16:12:45 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1989 Regents of the University of California.
@@ -28,57 +27,45 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- *	@(#)float.h     7.2 (Berkeley) 6/28/90
  */
 
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-#define FLT_RADIX	2		/* b */
-#define FLT_ROUNDS	1		/* FP addition rounds to nearest */
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD	0		/* no promotions */
-#endif
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
 
-#define FLT_MANT_DIG	24		/* p */
-#define FLT_EPSILON	1.19209290E-7F	/* b**(1-p) */
-#define FLT_MIN_EXP	(-127)		/* emin */
-#define FLT_MIN_10_EXP	(-38)		/* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP	127		/* emax */
-#define FLT_MAX_10_EXP	38		/* floor(log10((1-b**(-p))*b**emax)) */
+#define __FLT_RADIX		2		/* b */
+#define __FLT_ROUNDS		1		/* FP addition rounds to nearest */
+#define __FLT_EVAL_METHOD	0		/* no promotions */
 
-#define DBL_MANT_DIG	56
-#define DBL_EPSILON	2.77555756156289135E-17
-#define DBL_MIN_EXP	(-127)
-#define DBL_MIN_10_EXP	(-38)
-#define DBL_MAX_EXP	127
-#define DBL_MAX_10_EXP	38
+#define __FLT_MANT_DIG		24		/* p */
+#define __FLT_EPSILON		1.19209290E-7F	/* b**(1-p) */
+#define __FLT_DIG		6		/* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP		(-127)		/* emin */
+#define __FLT_MIN		2.93873588E-39F	/* b**(emin-1) */
+#define __FLT_MIN_10_EXP	(-38)		/* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP		127		/* emax */
+#define __FLT_MAX		1.70141173E+38F	/* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP	38		/* floor(log10((1-b**(-p))*b**emax)) */
 
-/* limits.h also defines this */
-#if !defined(FLT_DIG)
-# define FLT_DIG	6		/* floor((p-1)*log10(b))+(b == 10) */
-# define FLT_MIN	2.93873588E-39F	/* b**(emin-1) */
-# define FLT_MAX	1.70141173E+38F	/* (1-b**(-p))*b**emax */
-# define DBL_DIG	16
-# define DBL_MIN	2.938735877055718770E-39
-# define DBL_MAX	1.701411834604692294E+38
-#endif
+#define __DBL_MANT_DIG		56
+#define __DBL_EPSILON		2.77555756156289135E-17
+#define __DBL_DIG		16
+#define __DBL_MIN_EXP		(-127)
+#define __DBL_MIN		2.938735877055718770E-39
+#define __DBL_MIN_10_EXP	(-38)
+#define __DBL_MAX_EXP		127
+#define __DBL_MAX		1.701411834604692294E+38
+#define __DBL_MAX_10_EXP	38
 
-#define LDBL_MANT_DIG	DBL_MANT_DIG
-#define LDBL_EPSILON	DBL_EPSILON
-#define LDBL_DIG	DBL_DIG
-#define LDBL_MIN_EXP	DBL_MIN_EXP
-#define LDBL_MIN	DBL_MIN
-#define LDBL_MIN_10_EXP	DBL_MIN_10_EXP
-#define LDBL_MAX_EXP	DBL_MAX_EXP
-#define LDBL_MAX	DBL_MAX
-#define LDBL_MAX_10_EXP	DBL_MAX_10_EXP
+#define __LDBL_MANT_DIG		DBL_MANT_DIG
+#define __LDBL_EPSILON		DBL_EPSILON
+#define __LDBL_DIG		DBL_DIG
+#define __LDBL_MIN_EXP		DBL_MIN_EXP
+#define __LDBL_MIN		DBL_MIN
+#define __LDBL_MIN_10_EXP	DBL_MIN_10_EXP
+#define __LDBL_MAX_EXP		DBL_MAX_EXP
+#define __LDBL_MAX		DBL_MAX
+#define __LDBL_MAX_10_EXP	DBL_MAX_10_EXP
 
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG	18
-#endif
+#define __DECIMAL_DIG		18
 
-#endif	/* _MACHINE_FLOAT_H_ */
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/vax/include/internal_types.h b/sys/arch/vax/include/internal_types.h
deleted file mode 100644
index 3cf344f2df9..00000000000
--- a/sys/arch/vax/include/internal_types.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/* $OpenBSD: internal_types.h,v 1.1 2002/04/24 21:53:12 espie Exp $ */
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#define __DBL_DIG         16
-#define __DBL_MAX         1.701411834604692294E+38
-#define __DBL_MIN         2.938735877055718770E-39
-
-#define __FLT_DIG         6
-#define __FLT_MAX         1.70141173E+38F
-#define __FLT_MIN         2.93873588E-39F
-
-#endif