Add a new sys/limits.h file which in turn depends on machine/_limits.h

to get actual constant values. This is in preparation for machine/limits.h
retirement.

Discussed on:	standards@
Submitted by:	Craig Rodrigues <rodrigc@attbi.com>  (*)
Modified by:	kan

8 files changed, 389 insertions, 371 deletions

diff --git a/sys/alpha/include/_limits.h b/sys/alpha/include/_limits.h
index d45e08a..f42abab 100644
--- a/sys/alpha/include/_limits.h
+++ b/sys/alpha/include/_limits.h
@@ -35,73 +35,58 @@
  * $FreeBSD$
  */
 
-#ifndef	_MACHINE_LIMITS_H_
-#define	_MACHINE_LIMITS_H_
+#ifndef	_MACHINE__LIMITS_H_
+#define	_MACHINE__LIMITS_H_
 
-#define	CHAR_BIT	8		/* number of bits in a char */
+#define	__CHAR_BIT	8		/* number of bits in a char */
 
-/*
- * According to ANSI (section 2.2.4.2), the values below must be usable by
- * #if preprocessing directives.  Additionally, the expression must have the
- * same type as would an expression that is an object of the corresponding
- * type converted according to the integral promotions.  The subtraction for
- * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
- * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
- * These numbers are for the default configuration of gcc.  They work for
- * some other compilers as well, but this should not be depended on.
- */
-#define	SCHAR_MAX	0x7f		/* max value for a signed char */
-#define	SCHAR_MIN	(-0x7f-1)	/* min value for a signed char */
+#define	__SCHAR_MAX	0x7f		/* max value for a signed char */
+#define	__SCHAR_MIN	(-0x7f-1)	/* min value for a signed char */
 
-#define	UCHAR_MAX	0xffU		/* max value for an unsigned char */
-#define	CHAR_MAX	0x7f		/* max value for a char */
-#define	CHAR_MIN	(-0x7f-1)	/* min value for a char */
+#define	__UCHAR_MAX	0xffU		/* max value for an unsigned char */
+#define	__CHAR_MAX	0x7f		/* max value for a char */
+#define	__CHAR_MIN	(-0x7f-1)	/* min value for a char */
 
-#define	USHRT_MAX	0xffffU		/* max value for an unsigned short */
-#define	SHRT_MAX	0x7fff		/* max value for a short */
-#define	SHRT_MIN	(-0x7fff-1)	/* min value for a short */
+#define	__USHRT_MAX	0xffffU		/* max value for an unsigned short */
+#define	__SHRT_MAX	0x7fff		/* max value for a short */
+#define	__SHRT_MIN	(-0x7fff-1)	/* min value for a short */
 
-#define	UINT_MAX	0xffffffffU	/* max value for an unsigned int */
-#define	INT_MAX		0x7fffffff	/* max value for an int */
-#define	INT_MIN		(-0x7fffffff-1)	/* min value for an int */
+#define	__UINT_MAX	0xffffffffU	/* max value for an unsigned int */
+#define	__INT_MAX	0x7fffffff	/* max value for an int */
+#define	__INT_MIN	(-0x7fffffff-1)	/* min value for an int */
 
-#define	ULONG_MAX	0xffffffffffffffffUL	/* max for an unsigned long */
-#define	LONG_MAX	0x7fffffffffffffffL	/* max for a long */
-#define	LONG_MIN	(-0x7fffffffffffffffL-1) /* min for a long */
+#define	__ULONG_MAX	0xffffffffffffffffUL	/* max for an unsigned long */
+#define	__LONG_MAX	0x7fffffffffffffffL	/* max for a long */
+#define	__LONG_MIN	(-0x7fffffffffffffffL-1) /* min for a long */
 
 /* Long longs and longs are the same size on the alpha. */
 					/* max for an unsigned long long */
-#define	ULLONG_MAX	0xffffffffffffffffULL
-#define	LLONG_MAX	0x7fffffffffffffffLL	/* max for a long long */
-#define	LLONG_MIN	(-0x7fffffffffffffffLL-1) /* min for a long long */
+#define	__ULLONG_MAX	0xffffffffffffffffULL
+#define	__LLONG_MAX	0x7fffffffffffffffLL	/* max for a long long */
+#define	__LLONG_MIN	(-0x7fffffffffffffffLL-1) /* min for a long long */
 
-#if !defined(_ANSI_SOURCE)
-#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
+#define	__SSIZE_MAX	__LONG_MAX	/* max value for a ssize_t */
 
-#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
-#define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
+#define	__SIZE_T_MAX	__ULONG_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LONG_MAX	/* max value for a off_t */
-#define	OFF_MIN		LONG_MIN	/* min value for a off_t */
+#define	__OFF_MAX	__LONG_MAX	/* max value for a off_t */
+#define	__OFF_MIN	__LONG_MIN	/* min value for a off_t */
 
 /* Quads and longs are the same on the alpha.  Ensure they stay in sync. */
-#define	UQUAD_MAX	(ULONG_MAX)	/* max value for a uquad_t */
-#define	QUAD_MAX	(LONG_MAX)	/* max value for a quad_t */
-#define	QUAD_MIN	(LONG_MIN)	/* min value for a quad_t */
-#endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */
-#endif /* !_ANSI_SOURCE */
-
-#if (!defined(_ANSI_SOURCE)&&!defined(_POSIX_SOURCE)) || defined(_XOPEN_SOURCE)
-#define	LONG_BIT	64
-#define	WORD_BIT	32
-
-#define	DBL_DIG		15
-#define	DBL_MAX		1.7976931348623157E+308
-#define	DBL_MIN		2.2250738585072014E-308
-
-#define	FLT_DIG		6
-#define	FLT_MAX		3.40282347E+38F
-#define	FLT_MIN		1.17549435E-38F
+#define	__UQUAD_MAX	(__ULONG_MAX)	/* max value for a uquad_t */
+#define	__QUAD_MAX	(__LONG_MAX)	/* max value for a quad_t */
+#define	__QUAD_MIN	(__LONG_MIN)	/* min value for a quad_t */
+
+#define	__LONG_BIT	64
+#define	__WORD_BIT	32
+
+#define	__DBL_DIG	15
+#define	__DBL_MAX	1.7976931348623157E+308
+#define	__DBL_MIN	2.2250738585072014E-308
+
+#define	__FLT_DIG	6
+#define	__FLT_MAX	3.40282347E+38F
+#define	__FLT_MIN	1.17549435E-38F
 #endif
 
-#endif /* !_MACHINE_LIMITS_H_ */
+#endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/amd64/include/_limits.h b/sys/amd64/include/_limits.h
index e740acf..9c274b3 100644
--- a/sys/amd64/include/_limits.h
+++ b/sys/amd64/include/_limits.h
@@ -36,73 +36,55 @@
  * $FreeBSD$
  */
 
-#ifndef	_MACHINE_LIMITS_H_
-#define	_MACHINE_LIMITS_H_
+#ifndef	_MACHINE__LIMITS_H_
+#define	_MACHINE__LIMITS_H_
 
-#define	CHAR_BIT	8		/* number of bits in a char */
+#define	__CHAR_BIT	8		/* number of bits in a char */
 
-/*
- * According to ANSI (section 2.2.4.2), the values below must be usable by
- * #if preprocessing directives.  Additionally, the expression must have the
- * same type as would an expression that is an object of the corresponding
- * type converted according to the integral promotions.  The subtraction for
- * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
- * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
- * These numbers are for the default configuration of gcc.  They work for
- * some other compilers as well, but this should not be depended on.
- */
-#define	SCHAR_MAX	0x7f		/* max value for a signed char */
-#define	SCHAR_MIN	(-0x7f-1)	/* min value for a signed char */
+#define	__SCHAR_MAX	0x7f		/* max value for a signed char */
+#define	__SCHAR_MIN	(-0x7f-1)	/* min value for a signed char */
 
-#define	UCHAR_MAX	0xffU		/* max value for an unsigned char */
-#define	CHAR_MAX	0x7f		/* max value for a char */
-#define	CHAR_MIN	(-0x7f-1)	/* min value for a char */
+#define	__UCHAR_MAX	0xffU		/* max value for an unsigned char */
 
-#define	USHRT_MAX	0xffffU		/* max value for an unsigned short */
-#define	SHRT_MAX	0x7fff		/* max value for a short */
-#define	SHRT_MIN	(-0x7fff-1)	/* min value for a short */
+#define	__USHRT_MAX	0xffffU		/* max value for an unsigned short */
+#define	__SHRT_MAX	0x7fff		/* max value for a short */
+#define	__SHRT_MIN	(-0x7fff-1)	/* min value for a short */
 
-#define	UINT_MAX	0xffffffffU	/* max value for an unsigned int */
-#define	INT_MAX		0x7fffffff	/* max value for an int */
-#define	INT_MIN		(-0x7fffffff-1)	/* min value for an int */
+#define	__UINT_MAX	0xffffffffU	/* max value for an unsigned int */
+#define	__INT_MAX	0x7fffffff	/* max value for an int */
+#define	__INT_MIN	(-0x7fffffff-1)	/* min value for an int */
 
-#define	ULONG_MAX	0xffffffffffffffffUL	/* max for an unsigned long */
-#define	LONG_MAX	0x7fffffffffffffffL	/* max for a long */
-#define	LONG_MIN	(-0x7fffffffffffffffL-1) /* min for a long */
+#define	__ULONG_MAX	0xffffffffffffffffUL	/* max for an unsigned long */
+#define	__LONG_MAX	0x7fffffffffffffffL	/* max for a long */
+#define	__LONG_MIN	(-0x7fffffffffffffffL-1) /* min for a long */
 
 /* Long longs and longs are the same size on the alpha. */
 					/* max for an unsigned long long */
-#define	ULLONG_MAX	0xffffffffffffffffULL
-#define	LLONG_MAX	0x7fffffffffffffffLL	/* max for a long long */
-#define	LLONG_MIN	(-0x7fffffffffffffffLL-1) /* min for a long long */
+#define	__ULLONG_MAX	0xffffffffffffffffULL
+#define	__LLONG_MAX	0x7fffffffffffffffLL	/* max for a long long */
+#define	__LLONG_MIN	(-0x7fffffffffffffffLL-1) /* min for a long long */
 
-#if !defined(_ANSI_SOURCE)
-#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
+#define	__SSIZE_MAX	__LONG_MAX	/* max value for a ssize_t */
 
-#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
-#define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
+#define	__SIZE_T_MAX	__ULONG_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LONG_MAX	/* max value for an off_t */
-#define	OFF_MIN		LONG_MIN	/* min value for an off_t */
+#define	__OFF_MAX	__LONG_MAX	/* max value for an off_t */
+#define	__OFF_MIN	__LONG_MIN	/* min value for an off_t */
 
-/* Quads and longs are the same on the alpha.  Ensure they stay in sync. */
-#define	UQUAD_MAX	(ULONG_MAX)	/* max value for a uquad_t */
-#define	QUAD_MAX	(LONG_MAX)	/* max value for a quad_t */
-#define	QUAD_MIN	(LONG_MIN)	/* min value for a quad_t */
-#endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */
-#endif /* !_ANSI_SOURCE */
+/* Quads and longs are the same on the amd64.  Ensure they stay in sync. */
+#define	__UQUAD_MAX	(__ULONG_MAX)	/* max value for a uquad_t */
+#define	__QUAD_MAX	(__LONG_MAX)	/* max value for a quad_t */
+#define	__QUAD_MIN	(__LONG_MIN)	/* min value for a quad_t */
 
-#if (!defined(_ANSI_SOURCE)&&!defined(_POSIX_SOURCE)) || defined(_XOPEN_SOURCE)
-#define	LONG_BIT	64
-#define	WORD_BIT	32
+#define	__LONG_BIT	64
+#define	__WORD_BIT	32
 
-#define	DBL_DIG		15
-#define	DBL_MAX		1.7976931348623157E+308
-#define	DBL_MIN		2.2250738585072014E-308
+#define	__DBL_DIG	15
+#define	__DBL_MAX	1.7976931348623157E+308
+#define	__DBL_MIN	2.2250738585072014E-308
 
-#define	FLT_DIG		6
-#define	FLT_MAX		3.40282347E+38F
-#define	FLT_MIN		1.17549435E-38F
-#endif
+#define	__FLT_DIG	6
+#define	__FLT_MAX	3.40282347E+38F
+#define	__FLT_MIN	1.17549435E-38F
 
-#endif /* !_MACHINE_LIMITS_H_ */
+#endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/arm/include/_limits.h b/sys/arm/include/_limits.h
index b5e3bd1..ce1cd20 100644
--- a/sys/arm/include/_limits.h
+++ b/sys/arm/include/_limits.h
@@ -34,72 +34,65 @@
  * $FreeBSD$
  */
 
-#ifndef _MACHINE_LIMITS_H_
-#define	_MACHINE_LIMITS_H_
+#ifndef _MACHINE__LIMITS_H_
+#define	_MACHINE__LIMITS_H_
 
-#define	CHAR_BIT	8		/* number of bits in a char */
+#define	__CHAR_BIT	8		/* number of bits in a char */
 
-/*
- * According to ANSI (section 2.2.4.2), the values below must be usable by
- * #if preprocessing directives.  Additionally, the expression must have the
- * same type as would an expression that is an object of the corresponding
- * type converted according to the integral promotions.  The subtraction for
- * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
- * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
- * These numbers are for the default configuration of gcc.  They work for
- * some other compilers as well, but this should not be depended on.
- */
-#define	SCHAR_MAX	0x7f		/* max value for a signed char */
-#define	SCHAR_MIN	(-0x7f - 1)	/* min value for a signed char */
-
-#define	UCHAR_MAX	0xff		/* max value for an unsigned char */
+#define	__SCHAR_MAX	0x7f		/* max value for a signed char */
+#define	__SCHAR_MIN	(-0x7f - 1)	/* min value for a signed char */
 
-#ifdef __CHAR_UNSIGNED__
-#define	CHAR_MAX	UCHAR_MAX	/* max value for a char */
-#define	CHAR_MIN	0		/* min value for a char */
-#else
-#define	CHAR_MAX	SCHAR_MAX	/* max value for a char */
-#define	CHAR_MIN	SCHAR_MIN	/* min value for a char */
-#endif
+#define	__UCHAR_MAX	0xff		/* max value for an unsigned char */
 
-#define	USHRT_MAX	0xffff		/* max value for an unsigned short */
-#define	SHRT_MAX	0x7fff		/* max value for a short */
-#define	SHRT_MIN	(-0x7fff - 1)	/* min value for a short */
+#define	__USHRT_MAX	0xffff		/* max value for an unsigned short */
+#define	__SHRT_MAX	0x7fff		/* max value for a short */
+#define	__SHRT_MIN	(-0x7fff - 1)	/* min value for a short */
 
-#define	UINT_MAX	0xffffffffU	/* max value for an unsigned int */
-#define	INT_MAX		0x7fffffff	/* max value for an int */
-#define	INT_MIN		(-0x7fffffff - 1)	/* min value for an int */
+#define	__UINT_MAX	0xffffffffU	/* max value for an unsigned int */
+#define	__INT_MAX	0x7fffffff	/* max value for an int */
+#define	__INT_MIN	(-0x7fffffff - 1)	/* min value for an int */
 
 /* Bad hack for gcc configured to give 64-bit longs. */
 #ifdef _LARGE_LONG
-#define	ULONG_MAX	0xffffffffffffffffUL
-#define	LONG_MAX	0x7fffffffffffffffL
-#define	LONG_MIN	(-0x7fffffffffffffffL - 1)
+#define	__ULONG_MAX	0xffffffffffffffffUL
+#define	__LONG_MAX	0x7fffffffffffffffL
+#define	__LONG_MIN	(-0x7fffffffffffffffL - 1)
 #else
-#define	ULONG_MAX	0xffffffffUL	/* max value for an unsigned long */
-#define	LONG_MAX	0x7fffffffL	/* max value for a long */
-#define	LONG_MIN	(-0x7fffffffL - 1)	/* min value for a long */
+#define	__ULONG_MAX	0xffffffffUL	/* max value for an unsigned long */
+#define	__LONG_MAX	0x7fffffffL	/* max value for a long */
+#define	__LONG_MIN	(-0x7fffffffL - 1)	/* min value for a long */
 #endif
 
 			/* max value for an unsigned long long */
-#define	ULLONG_MAX	0xffffffffffffffffULL
-#define	LLONG_MAX	0x7fffffffffffffffLL	/* max value for a long long */
-#define	LLONG_MIN	(-0x7fffffffffffffffLL - 1)  /* min for a long long */
+#define	__ULLONG_MAX	0xffffffffffffffffULL
+#define	__LLONG_MAX	0x7fffffffffffffffLL	/* max value for a long long */
+#define	__LLONG_MIN	(-0x7fffffffffffffffLL - 1)  /* min for a long long */
 
-#if !defined(_ANSI_SOURCE)
-#define	SSIZE_MAX	INT_MAX		/* max value for a ssize_t */
+#define	__SSIZE_MAX	__INT_MAX	/* max value for a ssize_t */
 
-#if !defined(_POSIX_SOURCE)
-#define	SIZE_T_MAX	UINT_MAX	/* max value for a size_t */
+#define	__SIZE_T_MAX	__UINT_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LLONG_MAX	/* max value for a off_t */
-#define	OFF_MIN		LLONG_MIN	/* min value for a off_t */
+#define	__OFF_MAX	__LLONG_MAX	/* max value for a off_t */
+#define	__OFF_MIN	__LLONG_MIN	/* min value for a off_t */
 
 /* Quads and long longs are the same size.  Ensure they stay in sync. */
-#define	UQUAD_MAX	ULLONG_MAX	/* max value for a uquad_t */
-#define	QUAD_MAX	LLONG_MAX	/* max value for a quad_t */
-#define	QUAD_MIN	LLONG_MIN	/* min value for a quad_t */
-#endif /* !_POSIX_SOURCE */
-#endif /* !_ANSI_SOURCE */
+#define	__UQUAD_MAX	__ULLONG_MAX	/* max value for a uquad_t */
+#define	__QUAD_MAX	__LLONG_MAX	/* max value for a quad_t */
+#define	__QUAD_MIN	__LLONG_MIN	/* min value for a quad_t */
+
+#ifdef _LARGE_LONG
+#define	__LONG_BIT	64
+#else
+#define	__LONG_BIT	32
+#endif
+#define	__WORD_BIT	32
+
+#define	__DBL_DIG	15
+#define	__DBL_MAX	1.7976931348623157E+308
+#define	__DBL_MIN	2.2250738585072014E-308
+
+#define	__FLT_DIG	6
+#define	__FLT_MAX	3.40282347E+38F
+#define	__FLT_MIN	1.17549435E-38F
 
-#endif /* !_MACHINE_LIMITS_H_ */
+#endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/i386/include/_limits.h b/sys/i386/include/_limits.h
index 13ea139..1d57b55 100644
--- a/sys/i386/include/_limits.h
+++ b/sys/i386/include/_limits.h
@@ -34,72 +34,65 @@
  * $FreeBSD$
  */
 
-#ifndef _MACHINE_LIMITS_H_
-#define	_MACHINE_LIMITS_H_
+#ifndef _MACHINE__LIMITS_H_
+#define	_MACHINE__LIMITS_H_
 
-#define	CHAR_BIT	8		/* number of bits in a char */
+#define	__CHAR_BIT	8		/* number of bits in a char */
 
-/*
- * According to ANSI (section 2.2.4.2), the values below must be usable by
- * #if preprocessing directives.  Additionally, the expression must have the
- * same type as would an expression that is an object of the corresponding
- * type converted according to the integral promotions.  The subtraction for
- * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
- * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
- * These numbers are for the default configuration of gcc.  They work for
- * some other compilers as well, but this should not be depended on.
- */
-#define	SCHAR_MAX	0x7f		/* max value for a signed char */
-#define	SCHAR_MIN	(-0x7f - 1)	/* min value for a signed char */
-
-#define	UCHAR_MAX	0xff		/* max value for an unsigned char */
+#define	__SCHAR_MAX	0x7f		/* max value for a signed char */
+#define	__SCHAR_MIN	(-0x7f - 1)	/* min value for a signed char */
 
-#ifdef __CHAR_UNSIGNED__
-#define	CHAR_MAX	UCHAR_MAX	/* max value for a char */
-#define	CHAR_MIN	0		/* min value for a char */
-#else
-#define	CHAR_MAX	SCHAR_MAX	/* max value for a char */
-#define	CHAR_MIN	SCHAR_MIN	/* min value for a char */
-#endif
+#define	__UCHAR_MAX	0xff		/* max value for an unsigned char */
 
-#define	USHRT_MAX	0xffff		/* max value for an unsigned short */
-#define	SHRT_MAX	0x7fff		/* max value for a short */
-#define	SHRT_MIN	(-0x7fff - 1)	/* min value for a short */
+#define	__USHRT_MAX	0xffff		/* max value for an unsigned short */
+#define	__SHRT_MAX	0x7fff		/* max value for a short */
+#define	__SHRT_MIN	(-0x7fff - 1)	/* min value for a short */
 
-#define	UINT_MAX	0xffffffffU	/* max value for an unsigned int */
-#define	INT_MAX		0x7fffffff	/* max value for an int */
-#define	INT_MIN		(-0x7fffffff - 1)	/* min value for an int */
+#define	__UINT_MAX	0xffffffffU	/* max value for an unsigned int */
+#define	__INT_MAX	0x7fffffff	/* max value for an int */
+#define	__INT_MIN	(-0x7fffffff - 1)	/* min value for an int */
 
 /* Bad hack for gcc configured to give 64-bit longs. */
 #ifdef _LARGE_LONG
-#define	ULONG_MAX	0xffffffffffffffffUL
-#define	LONG_MAX	0x7fffffffffffffffL
-#define	LONG_MIN	(-0x7fffffffffffffffL - 1)
+#define	__ULONG_MAX	0xffffffffffffffffUL
+#define	__LONG_MAX	0x7fffffffffffffffL
+#define	__LONG_MIN	(-0x7fffffffffffffffL - 1)
 #else
-#define	ULONG_MAX	0xffffffffUL	/* max value for an unsigned long */
-#define	LONG_MAX	0x7fffffffL	/* max value for a long */
-#define	LONG_MIN	(-0x7fffffffL - 1)	/* min value for a long */
+#define	__ULONG_MAX	0xffffffffUL	/* max value for an unsigned long */
+#define	__LONG_MAX	0x7fffffffL	/* max value for a long */
+#define	__LONG_MIN	(-0x7fffffffL - 1)	/* min value for a long */
 #endif
 
 			/* max value for an unsigned long long */
-#define	ULLONG_MAX	0xffffffffffffffffULL
-#define	LLONG_MAX	0x7fffffffffffffffLL	/* max value for a long long */
-#define	LLONG_MIN	(-0x7fffffffffffffffLL - 1)  /* min for a long long */
+#define	__ULLONG_MAX	0xffffffffffffffffULL
+#define	__LLONG_MAX	0x7fffffffffffffffLL	/* max value for a long long */
+#define	__LLONG_MIN	(-0x7fffffffffffffffLL - 1)  /* min for a long long */
 
-#if !defined(_ANSI_SOURCE)
-#define	SSIZE_MAX	INT_MAX		/* max value for a ssize_t */
+#define	__SSIZE_MAX	__INT_MAX	/* max value for a ssize_t */
 
-#if !defined(_POSIX_SOURCE)
-#define	SIZE_T_MAX	UINT_MAX	/* max value for a size_t */
+#define	__SIZE_T_MAX	__UINT_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LLONG_MAX	/* max value for an off_t */
-#define	OFF_MIN		LLONG_MIN	/* min value for an off_t */
+#define	__OFF_MAX	__LLONG_MAX	/* max value for an off_t */
+#define	__OFF_MIN	__LLONG_MIN	/* min value for an off_t */
 
 /* Quads and long longs are the same size.  Ensure they stay in sync. */
-#define	UQUAD_MAX	ULLONG_MAX	/* max value for a uquad_t */
-#define	QUAD_MAX	LLONG_MAX	/* max value for a quad_t */
-#define	QUAD_MIN	LLONG_MIN	/* min value for a quad_t */
-#endif /* !_POSIX_SOURCE */
-#endif /* !_ANSI_SOURCE */
+#define	__UQUAD_MAX	__ULLONG_MAX	/* max value for a uquad_t */
+#define	__QUAD_MAX	__LLONG_MAX	/* max value for a quad_t */
+#define	__QUAD_MIN	__LLONG_MIN	/* min value for a quad_t */
+
+#ifdef _LARGE_LONG
+#define	__LONG_BIT	64
+#else
+#define	__LONG_BIT	32
+#endif
+#define	__WORD_BIT	32
+
+#define	__DBL_DIG	15
+#define	__DBL_MAX	1.7976931348623157E+308
+#define	__DBL_MIN	2.2250738585072014E-308
+
+#define	__FLT_DIG	6
+#define	__FLT_MAX	3.40282347E+38F
+#define	__FLT_MIN	1.17549435E-38F
 
-#endif /* !_MACHINE_LIMITS_H_ */
+#endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/ia64/include/_limits.h b/sys/ia64/include/_limits.h
index b694386..1540854 100644
--- a/sys/ia64/include/_limits.h
+++ b/sys/ia64/include/_limits.h
@@ -36,68 +36,55 @@
  *	@(#)limits.h	8.3 (Berkeley) 1/4/94
  */
 
-#define	CHAR_BIT	8		/* number of bits in a char */
+#ifndef _MACHINE__LIMITS_H_
+#define	_MACHINE__LIMITS_H_
 
-/*
- * According to ANSI (section 2.2.4.2), the values below must be usable by
- * #if preprocessing directives.  Additionally, the expression must have the
- * same type as would an expression that is an object of the corresponding
- * type converted according to the integral promotions.  The subtraction for
- * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
- * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
- * These numbers are for the default configuration of gcc.  They work for
- * some other compilers as well, but this should not be depended on.
- */
-#define	SCHAR_MAX	0x7f		/* max value for a signed char */
-#define	SCHAR_MIN	(-0x7f-1)	/* min value for a signed char */
+#define	__CHAR_BIT	8		/* number of bits in a char */
 
-#define	UCHAR_MAX	0xffU		/* max value for an unsigned char */
-#define	CHAR_MAX	0x7f		/* max value for a char */
-#define	CHAR_MIN	(-0x7f-1)	/* min value for a char */
+#define	__SCHAR_MAX	0x7f		/* max value for a signed char */
+#define	__SCHAR_MIN	(-0x7f-1)	/* min value for a signed char */
 
-#define	USHRT_MAX	0xffffU		/* max value for an unsigned short */
-#define	SHRT_MAX	0x7fff		/* max value for a short */
-#define	SHRT_MIN	(-0x7fff-1)	/* min value for a short */
+#define	__UCHAR_MAX	0xffU		/* max value for an unsigned char */
 
-#define	UINT_MAX	0xffffffffU	/* max value for an unsigned int */
-#define	INT_MAX		0x7fffffff	/* max value for an int */
-#define	INT_MIN		(-0x7fffffff-1)	/* min value for an int */
+#define	__USHRT_MAX	0xffffU		/* max value for an unsigned short */
+#define	__SHRT_MAX	0x7fff		/* max value for a short */
+#define	__SHRT_MIN	(-0x7fff-1)	/* min value for a short */
 
-#define	ULONG_MAX	0xffffffffffffffffUL	/* max for an unsigned long */
-#define	LONG_MAX	0x7fffffffffffffffL	/* max for a long */
-#define	LONG_MIN	(-0x7fffffffffffffffL-1) /* min for a long */
+#define	__UINT_MAX	0xffffffffU	/* max value for an unsigned int */
+#define	__INT_MAX	0x7fffffff	/* max value for an int */
+#define	__INT_MIN	(-0x7fffffff-1)	/* min value for an int */
+
+#define	__ULONG_MAX	0xffffffffffffffffUL	/* max for an unsigned long */
+#define	__LONG_MAX	0x7fffffffffffffffL	/* max for a long */
+#define	__LONG_MIN	(-0x7fffffffffffffffL-1) /* min for a long */
 
 /* Long longs and longs are the same size on the IA-64. */
 					/* max for an unsigned long long */
-#define	ULLONG_MAX	0xffffffffffffffffULL
-#define	LLONG_MAX	0x7fffffffffffffffLL	/* max for a long long */
-#define	LLONG_MIN	(-0x7fffffffffffffffLL-1) /* min for a long long */
+#define	__ULLONG_MAX	0xffffffffffffffffULL
+#define	__LLONG_MAX	0x7fffffffffffffffLL	/* max for a long long */
+#define	__LLONG_MIN	(-0x7fffffffffffffffLL-1) /* min for a long long */
 
-#if !defined(_ANSI_SOURCE)
-#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
+#define	__SSIZE_MAX	__LONG_MAX	/* max value for a ssize_t */
 
-#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
-#define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
+#define	__SIZE_T_MAX	__ULONG_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LONG_MAX	/* max value for an off_t */
-#define	OFF_MIN		LONG_MIN	/* min value for an off_t */
+#define	__OFF_MAX	__LONG_MAX	/* max value for an off_t */
+#define	__OFF_MIN	__LONG_MIN	/* min value for an off_t */
 
 /* Quads and longs are the same.  Ensure they stay in sync. */
-#define	UQUAD_MAX	(ULONG_MAX)	/* max value for a uquad_t */
-#define	QUAD_MAX	(LONG_MAX)	/* max value for a quad_t */
-#define	QUAD_MIN	(LONG_MIN)	/* min value for a quad_t */
-#endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */
-#endif /* !_ANSI_SOURCE */
-
-#if (!defined(_ANSI_SOURCE)&&!defined(_POSIX_SOURCE)) || defined(_XOPEN_SOURCE)
-#define	LONG_BIT	64
-#define	WORD_BIT	32
-
-#define	DBL_DIG		15
-#define	DBL_MAX		1.7976931348623157E+308
-#define	DBL_MIN		2.2250738585072014E-308
-
-#define	FLT_DIG		6
-#define	FLT_MAX		3.40282347E+38F
-#define	FLT_MIN		1.17549435E-38F
-#endif
+#define	__UQUAD_MAX	(__ULONG_MAX)	/* max value for a uquad_t */
+#define	__QUAD_MAX	(__LONG_MAX)	/* max value for a quad_t */
+#define	__QUAD_MIN	(__LONG_MIN)	/* min value for a quad_t */
+
+#define	__LONG_BIT	64
+#define	__WORD_BIT	32
+
+#define	__DBL_DIG	15
+#define	__DBL_MAX	1.7976931348623157E+308
+#define	__DBL_MIN	2.2250738585072014E-308
+
+#define	__FLT_DIG	6
+#define	__FLT_MAX	3.40282347E+38F
+#define	__FLT_MIN	1.17549435E-38F
+
+#endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/powerpc/include/_limits.h b/sys/powerpc/include/_limits.h
index 1b06efd..4248d52 100644
--- a/sys/powerpc/include/_limits.h
+++ b/sys/powerpc/include/_limits.h
@@ -34,75 +34,64 @@
  * $FreeBSD$
  */
 
-#ifndef _MACHINE_LIMITS_H_
-#define	_MACHINE_LIMITS_H_
+#ifndef _MACHINE__LIMITS_H_
+#define	_MACHINE__LIMITS_H_
 
-#define	CHAR_BIT	8		/* number of bits in a char */
+#define	__CHAR_BIT	8		/* number of bits in a char */
 
-/*
- * According to ANSI (section 2.2.4.2), the values below must be usable by
- * #if preprocessing directives.  Additionally, the expression must have the
- * same type as would an expression that is an object of the corresponding
- * type converted according to the integral promotions.  The subtraction for
- * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
- * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
- * These numbers are for the default configuration of gcc.  They work for
- * some other compilers as well, but this should not be depended on.
- */
-#define	SCHAR_MAX	0x7f		/* max value for a signed char */
-#define	SCHAR_MIN	(-0x7f - 1)	/* min value for a signed char */
-
-#define	UCHAR_MAX	0xff		/* max value for an unsigned char */
+#define	__SCHAR_MAX	0x7f		/* max value for a signed char */
+#define	__SCHAR_MIN	(-0x7f - 1)	/* min value for a signed char */
 
-#ifdef __CHAR_UNSIGNED__
-#define	CHAR_MAX	UCHAR_MAX	/* max value for a char */
-#define	CHAR_MIN	0		/* min value for a char */
-#else
-#define	CHAR_MAX	SCHAR_MAX	/* max value for a char */
-#define	CHAR_MIN	SCHAR_MIN	/* min value for a char */
-#endif
+#define	__UCHAR_MAX	0xff		/* max value for an unsigned char */
 
-#define	USHRT_MAX	0xffff		/* max value for an unsigned short */
-#define	SHRT_MAX	0x7fff		/* max value for a short */
-#define	SHRT_MIN	(-0x7fff - 1)	/* min value for a short */
+#define	__USHRT_MAX	0xffff		/* max value for an unsigned short */
+#define	__SHRT_MAX	0x7fff		/* max value for a short */
+#define	__SHRT_MIN	(-0x7fff - 1)	/* min value for a short */
 
-#define	UINT_MAX	0xffffffffU	/* max value for an unsigned int */
-#define	INT_MAX		0x7fffffff	/* max value for an int */
-#define	INT_MIN		(-0x7fffffff - 1)	/* min value for an int */
+#define	__UINT_MAX	0xffffffffU	/* max value for an unsigned int */
+#define	__INT_MAX	0x7fffffff	/* max value for an int */
+#define	__INT_MIN	(-0x7fffffff - 1)	/* min value for an int */
 
 /* Bad hack for gcc configured to give 64-bit longs. */
 #ifdef _LARGE_LONG
-#define	ULONG_MAX	0xffffffffffffffffUL
-#define	LONG_MAX	0x7fffffffffffffffL
-#define	LONG_MIN	(-0x7fffffffffffffffL - 1)
+#define	__ULONG_MAX	0xffffffffffffffffUL
+#define	__LONG_MAX	0x7fffffffffffffffL
+#define	__LONG_MIN	(-0x7fffffffffffffffL - 1)
 #else
-#define	ULONG_MAX	0xffffffffUL	/* max value for an unsigned long */
-#define	LONG_MAX	0x7fffffffL	/* max value for a long */
-#define	LONG_MIN	(-0x7fffffffL - 1)	/* min value for a long */
+#define	__ULONG_MAX	0xffffffffUL	/* max value for an unsigned long */
+#define	__LONG_MAX	0x7fffffffL	/* max value for a long */
+#define	__LONG_MIN	(-0x7fffffffL - 1)	/* min value for a long */
 #endif
 
-			/* max value for an unsigned long long */
-#define	ULLONG_MAX	0xffffffffffffffffULL
-#define	LLONG_MAX	0x7fffffffffffffffLL	/* max value for a long long */
-#define	LLONG_MIN	(-0x7fffffffffffffffLL - 1)  /* min for a long long */
+#define	__ULLONG_MAX	0xffffffffffffffffULL
+#define	__LLONG_MAX	0x7fffffffffffffffLL	/* max value for a long long */
+#define	__LLONG_MIN	(-0x7fffffffffffffffLL - 1)  /* min for a long long */
 
-#if !defined(_ANSI_SOURCE)
-#define	SSIZE_MAX	INT_MAX		/* max value for a ssize_t */
+#define	__SSIZE_MAX	__INT_MAX	/* max value for a ssize_t */
 
-#if !defined(_POSIX_SOURCE)
-#define	SIZE_T_MAX	UINT_MAX	/* max value for a size_t */
+#define	__SIZE_T_MAX	__UINT_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LLONG_MAX	/* max value for an off_t */
-#define	OFF_MIN		LLONG_MIN	/* min value for an off_t */
+#define	__OFF_MAX	__LLONG_MAX	/* max value for an off_t */
+#define	__OFF_MIN	__LLONG_MIN	/* min value for an off_t */
 
 /* Quads and long longs are the same size.  Ensure they stay in sync. */
-#define	UQUAD_MAX	ULLONG_MAX	/* max value for a uquad_t */
-#define	QUAD_MAX	LLONG_MAX	/* max value for a quad_t */
-#define	QUAD_MIN	LLONG_MIN	/* min value for a quad_t */
+#define	__UQUAD_MAX	__ULLONG_MAX	/* max value for a uquad_t */
+#define	__QUAD_MAX	__LLONG_MAX	/* max value for a quad_t */
+#define	__QUAD_MIN	__LLONG_MIN	/* min value for a quad_t */
+
+#ifdef _LARGE_LONG
+#define	__LONG_BIT	64
+#else
+#define	__LONG_BIT	32
+#endif
+#define	__WORD_BIT	32
 
-#define LONG_BIT	32
+#define	__DBL_DIG	15
+#define	__DBL_MAX	1.7976931348623157E+308
+#define	__DBL_MIN	2.2250738585072014E-308
 
-#endif /* !_POSIX_SOURCE */
-#endif /* !_ANSI_SOURCE */
+#define	__FLT_DIG	6
+#define	__FLT_MAX	3.40282347E+38F
+#define	__FLT_MIN	1.17549435E-38F
 
-#endif /* !_MACHINE_LIMITS_H_ */
+#endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/sparc64/include/_limits.h b/sys/sparc64/include/_limits.h
index be8cf0d..f76a0ef 100644
--- a/sys/sparc64/include/_limits.h
+++ b/sys/sparc64/include/_limits.h
@@ -27,73 +27,55 @@
  * $FreeBSD$
  */
 
-#ifndef	_MACHINE_LIMITS_H_
-#define	_MACHINE_LIMITS_H_
+#ifndef	_MACHINE__LIMITS_H_
+#define	_MACHINE__LIMITS_H_
 
-#define	CHAR_BIT	8		/* number of bits in a char */
+#define	__CHAR_BIT	8		/* number of bits in a char */
 
-/*
- * According to ANSI (section 2.2.4.2), the values below must be usable by
- * #if preprocessing directives.  Additionally, the expression must have the
- * same type as would an expression that is an object of the corresponding
- * type converted according to the integral promotions.  The subtraction for
- * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
- * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
- * These numbers are for the default configuration of gcc.  They work for
- * some other compilers as well, but this should not be depended on.
- */
-#define	SCHAR_MAX	0x7f		/* max value for a signed char */
-#define	SCHAR_MIN	(-0x7f-1)	/* min value for a signed char */
+#define	__SCHAR_MAX	0x7f		/* max value for a signed char */
+#define	__SCHAR_MIN	(-0x7f-1)	/* min value for a signed char */
 
-#define	UCHAR_MAX	0xffU		/* max value for an unsigned char */
-#define	CHAR_MAX	0x7f		/* max value for a char */
-#define	CHAR_MIN	(-0x7f-1)	/* min value for a char */
+#define	__UCHAR_MAX	0xffU		/* max value for an unsigned char */
 
-#define	USHRT_MAX	0xffffU		/* max value for an unsigned short */
-#define	SHRT_MAX	0x7fff		/* max value for a short */
-#define	SHRT_MIN	(-0x7fff-1)	/* min value for a short */
+#define	__USHRT_MAX	0xffffU		/* max value for an unsigned short */
+#define	__SHRT_MAX	0x7fff		/* max value for a short */
+#define	__SHRT_MIN	(-0x7fff-1)	/* min value for a short */
 
-#define	UINT_MAX	0xffffffffU	/* max value for an unsigned int */
-#define	INT_MAX		0x7fffffff	/* max value for an int */
-#define	INT_MIN		(-0x7fffffff-1)	/* min value for an int */
+#define	__UINT_MAX	0xffffffffU	/* max value for an unsigned int */
+#define	__INT_MAX	0x7fffffff	/* max value for an int */
+#define	__INT_MIN	(-0x7fffffff-1)	/* min value for an int */
 
-#define	ULONG_MAX	0xffffffffffffffffUL	/* max for an unsigned long */
-#define	LONG_MAX	0x7fffffffffffffffL	/* max for a long */
-#define	LONG_MIN	(-0x7fffffffffffffffL-1) /* min for a long */
+#define	__ULONG_MAX	0xffffffffffffffffUL	/* max for an unsigned long */
+#define	__LONG_MAX	0x7fffffffffffffffL	/* max for a long */
+#define	__LONG_MIN	(-0x7fffffffffffffffL-1) /* min for a long */
 
-/* Long longs and longs are the same size on the alpha. */
+/* Long longs and longs are the same size on sparc64. */
 					/* max for an unsigned long long */
-#define	ULLONG_MAX	0xffffffffffffffffULL
-#define	LLONG_MAX	0x7fffffffffffffffLL	/* max for a long long */
-#define	LLONG_MIN	(-0x7fffffffffffffffLL-1) /* min for a long long */
+#define	__ULLONG_MAX	0xffffffffffffffffULL
+#define	__LLONG_MAX	0x7fffffffffffffffLL	/* max for a long long */
+#define	__LLONG_MIN	(-0x7fffffffffffffffLL-1) /* min for a long long */
 
-#if !defined(_ANSI_SOURCE)
-#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
+#define	__SSIZE_MAX	__LONG_MAX	/* max value for a ssize_t */
 
-#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
-#define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */
+#define	__SIZE_T_MAX	__ULONG_MAX	/* max value for a size_t */
 
-#define	OFF_MAX		LONG_MAX	/* max value for an off_t */
-#define	OFF_MIN		LONG_MIN	/* min value for an off_t */
+#define	__OFF_MAX	__LONG_MAX	/* max value for an off_t */
+#define	__OFF_MIN	__LONG_MIN	/* min value for an off_t */
 
 /* Quads and longs are the same on the alpha.  Ensure they stay in sync. */
-#define	UQUAD_MAX	(ULONG_MAX)	/* max value for a uquad_t */
-#define	QUAD_MAX	(LONG_MAX)	/* max value for a quad_t */
-#define	QUAD_MIN	(LONG_MIN)	/* min value for a quad_t */
-#endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */
-#endif /* !_ANSI_SOURCE */
-
-#if (!defined(_ANSI_SOURCE)&&!defined(_POSIX_SOURCE)) || defined(_XOPEN_SOURCE)
-#define	LONG_BIT	64
-#define	WORD_BIT	32
-
-#define	DBL_DIG		15
-#define	DBL_MAX		1.7976931348623157E+308
-#define	DBL_MIN		2.2250738585072014E-308
-
-#define	FLT_DIG		6
-#define	FLT_MAX		3.40282347E+38F
-#define	FLT_MIN		1.17549435E-38F
-#endif
-
-#endif /* !_MACHINE_LIMITS_H_ */
+#define	__UQUAD_MAX	(__ULONG_MAX)	/* max value for a uquad_t */
+#define	__QUAD_MAX	(__LONG_MAX)	/* max value for a quad_t */
+#define	__QUAD_MIN	(__LONG_MIN)	/* min value for a quad_t */
+
+#define	__LONG_BIT	64
+#define	__WORD_BIT	32
+
+#define	__DBL_DIG	15
+#define	__DBL_MAX	1.7976931348623157E+308
+#define	__DBL_MIN	2.2250738585072014E-308
+
+#define	__FLT_DIG	6
+#define	__FLT_MAX	3.40282347E+38F
+#define	__FLT_MIN	1.17549435E-38F
+
+#endif /* !_MACHINE__LIMITS_H_ */
diff --git a/sys/sys/limits.h b/sys/sys/limits.h
new file mode 100644
index 0000000..92387e9
--- /dev/null
+++ b/sys/sys/limits.h
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 1988, 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef	_SYS_LIMITS_H_
+#define	_SYS_LIMITS_H_
+
+#include <machine/_limits.h>
+
+#define	CHAR_BIT	__CHAR_BIT	/* number of bits in a char */
+
+/*
+ * According to ANSI (section 2.2.4.2), the values below must be usable by
+ * #if preprocessing directives.  Additionally, the expression must have the
+ * same type as would an expression that is an object of the corresponding
+ * type converted according to the integral promotions.  The subtraction for
+ * INT_MIN, etc., is so the value is not unsigned; e.g., 0x80000000 is an
+ * unsigned int for 32-bit two's complement ANSI compilers (section 3.1.3.2).
+ * These numbers are for the default configuration of gcc.  They work for
+ * some other compilers as well, but this should not be depended on.
+ */
+#define	SCHAR_MAX	__SCHAR_MAX	/* max value for a signed char */
+#define	SCHAR_MIN	__SCHAR_MIN	/* min value for a signed char */
+
+#define	UCHAR_MAX	__UCHAR_MAX	/* max value for an unsigned char */
+#define	CHAR_MAX	__CHAR_MAX	/* max value for a char */
+#define	CHAR_MIN	__CHAR_MIN	/* min value for a char */
+
+#define	USHRT_MAX	__USHRT_MAX	/* max value for an unsigned short */
+#define	SHRT_MAX	__SHRT_MAX	/* max value for a short */
+#define	SHRT_MIN	__SHRT_MIN	/* min value for a short */
+
+#define	UINT_MAX	__UNIT_MAX	/* max value for an unsigned int */
+#define	INT_MAX		__INT_MAX	/* max value for an int */
+#define	INT_MIN		__INT_MIN	/* min value for an int */
+
+#define	ULONG_MAX	__ULONG_MAX	/* max for an unsigned long */
+#define	LONG_MAX	__LONG_MAX	/* max for a long */
+#define	LONG_MIN	__LONG_MIN	/* min for a long */
+
+/* Long longs and longs are the same size on the alpha. */
+					/* max for an unsigned long long */
+#define	ULLONG_MAX	__ULLONG_MAX
+#define	LLONG_MAX	__LLONG_MAX	/* max for a long long */
+#define	LLONG_MIN	__LLONG_MIN	/* min for a long long */
+
+#if !defined(_ANSI_SOURCE)
+#define	SSIZE_MAX	__SSIZE_MAX	/* max value for a ssize_t */
+
+#if !defined(_POSIX_SOURCE) && !defined(_XOPEN_SOURCE)
+#define	SIZE_T_MAX	__SIZE_T_MAX	/* max value for a size_t */
+
+#define	OFF_MAX		__OFF_MAX	/* max value for a off_t */
+#define	OFF_MIN		__OFF_MIN	/* min value for a off_t */
+
+/* Quads and longs are the same on the alpha.  Ensure they stay in sync. */
+#define	UQUAD_MAX	(__UQUAD_MAX)	/* max value for a uquad_t */
+#define	QUAD_MAX	(__QUAD_MAX)	/* max value for a quad_t */
+#define	QUAD_MIN	(__QUAD_MIN)	/* min value for a quad_t */
+#endif /* !_POSIX_SOURCE && !_XOPEN_SOURCE */
+#endif /* !_ANSI_SOURCE */
+
+#if (!defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)) || defined(_XOPEN_SOURCE)
+#define	LONG_BIT	__LONG_BIT
+#define	WORD_BIT	__WORD_BIT
+
+#define	DBL_DIG		__DBL_DIG
+#define	DBL_MAX		__DBL_MAX
+#define	DBL_MIN		__DBL_MIN
+
+#define	FLT_DIG		__FLT_DIG
+#define	FLT_MAX		__FLT_MAX
+#define	FLT_MIN		__FLT_MIN
+#endif
+
+#endif /* !_SYS_LIMITS_H_ */