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, 54 deletions

diff --git a/sys/arch/amd64/include/float.h b/sys/arch/amd64/include/_float.h
index c80b7a1e413..5978a547c7e 100644
--- a/sys/arch/amd64/include/float.h
+++ b/sys/arch/amd64/include/_float.h
@@ -1,5 +1,4 @@
-/*	$OpenBSD: float.h,v 1.5 2011/08/29 13:13:21 kettenis Exp $	*/
-/*	$NetBSD: float.h,v 1.8 1995/06/20 20:45:37 jtc Exp $	*/
+/*	$OpenBSD: _float.h,v 1.1 2012/06/26 16:12:43 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.1 (Berkeley) 5/8/90
  */
 
-#ifndef _MACHINE_FLOAT_H_
-#define _MACHINE_FLOAT_H_
-
-#include <sys/cdefs.h>
-
-__BEGIN_DECLS
-int __flt_rounds(void);
-__END_DECLS
+#ifndef _MACHINE__FLOAT_H_
+#define _MACHINE__FLOAT_H_
 
-#define FLT_RADIX	2		/* b */
-#define FLT_ROUNDS	__flt_rounds()
-#if __ISO_C_VISIBLE >= 1999
-#define FLT_EVAL_METHOD	0		/* no promotions */
-#endif
+#define __FLT_RADIX		2		/* b */
+#define __FLT_ROUNDS		__flt_rounds()
+#define __FLT_EVAL_METHOD	0		/* no promotions */
 
-#define FLT_MANT_DIG	24		/* p */
-#define FLT_EPSILON	1.19209290E-07F	/* b**(1-p) */
-#define FLT_DIG		6		/* floor((p-1)*log10(b))+(b == 10) */
-#define FLT_MIN_EXP	(-125)		/* emin */
-#define FLT_MIN		1.17549435E-38F	/* b**(emin-1) */
-#define FLT_MIN_10_EXP	(-37)		/* ceil(log10(b**(emin-1))) */
-#define FLT_MAX_EXP	128		/* emax */
-#define FLT_MAX		3.40282347E+38F	/* (1-b**(-p))*b**emax */
-#define FLT_MAX_10_EXP	38		/* floor(log10((1-b**(-p))*b**emax)) */
+#define __FLT_MANT_DIG		24		/* p */
+#define __FLT_EPSILON		1.19209290E-07F	/* b**(1-p) */
+#define __FLT_DIG		6		/* floor((p-1)*log10(b))+(b == 10) */
+#define __FLT_MIN_EXP		(-125)		/* emin */
+#define __FLT_MIN		1.17549435E-38F	/* b**(emin-1) */
+#define __FLT_MIN_10_EXP	(-37)		/* ceil(log10(b**(emin-1))) */
+#define __FLT_MAX_EXP		128		/* emax */
+#define __FLT_MAX		3.40282347E+38F	/* (1-b**(-p))*b**emax */
+#define __FLT_MAX_10_EXP	38		/* floor(log10((1-b**(-p))*b**emax)) */
 
-#define DBL_MANT_DIG	53
-#define DBL_EPSILON	2.2204460492503131E-16
-#define DBL_DIG		15
-#define DBL_MIN_EXP	(-1021)
-#define DBL_MIN		2.2250738585072014E-308
-#define DBL_MIN_10_EXP	(-307)
-#define DBL_MAX_EXP	1024
-#define DBL_MAX		1.7976931348623157E+308
-#define DBL_MAX_10_EXP	308
+#define __DBL_MANT_DIG		53
+#define __DBL_EPSILON		2.2204460492503131E-16
+#define __DBL_DIG		15
+#define __DBL_MIN_EXP		(-1021)
+#define __DBL_MIN		2.2250738585072014E-308
+#define __DBL_MIN_10_EXP	(-307)
+#define __DBL_MAX_EXP		1024
+#define __DBL_MAX		1.7976931348623157E+308
+#define __DBL_MAX_10_EXP	308
 
-#define LDBL_MANT_DIG	64
-#define LDBL_EPSILON	1.08420217248550443401e-19L
-#define LDBL_DIG	18
-#define LDBL_MIN_EXP	(-16381)
-#define LDBL_MIN	3.36210314311209350626e-4932L
-#define LDBL_MIN_10_EXP	(-4931)
-#define LDBL_MAX_EXP	16384
-#define LDBL_MAX	1.18973149535723176502e+4932L
-#define LDBL_MAX_10_EXP	4932
+#define __LDBL_MANT_DIG		64
+#define __LDBL_EPSILON		1.08420217248550443401e-19L
+#define __LDBL_DIG		18
+#define __LDBL_MIN_EXP		(-16381)
+#define __LDBL_MIN		3.36210314311209350626e-4932L
+#define __LDBL_MIN_10_EXP	(-4931)
+#define __LDBL_MAX_EXP		16384
+#define __LDBL_MAX		1.18973149535723176502e+4932L
+#define __LDBL_MAX_10_EXP	4932
 
-#if __ISO_C_VISIBLE >= 1999
-#define DECIMAL_DIG	21
-#endif
+#define __DECIMAL_DIG		21
 
-#endif	/* _MACHINE_FLOAT_H_ */
+#endif /* _MACHINE__FLOAT_H_ */
diff --git a/sys/arch/amd64/include/internal_types.h b/sys/arch/amd64/include/internal_types.h
deleted file mode 100644
index debdc9cfc32..00000000000
--- a/sys/arch/amd64/include/internal_types.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*	$OpenBSD: internal_types.h,v 1.2 2004/09/16 13:10:57 miod Exp $	*/
-/* Public domain */
-#ifndef _MACHINE_INTERNAL_TYPES_H_
-#define _MACHINE_INTERNAL_TYPES_H_
-
-#endif