Module Name: src
Committed By: matt
Date: Mon Jul 11 02:54:05 UTC 2011
Modified Files:
src/sys/arch/hppa/include: float.h limits.h
Log Message:
Fix FLT_* and DBL_* redefinition problem.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/hppa/include/float.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hppa/include/limits.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/hppa/include/float.h
diff -u src/sys/arch/hppa/include/float.h:1.7 src/sys/arch/hppa/include/float.h:1.8
--- src/sys/arch/hppa/include/float.h:1.7 Sun Dec 11 12:17:37 2005
+++ src/sys/arch/hppa/include/float.h Mon Jul 11 02:54:04 2011
@@ -1,19 +1,55 @@
-/* $NetBSD: float.h,v 1.7 2005/12/11 12:17:37 christos Exp $ */
+/* $NetBSD: float.h,v 1.8 2011/07/11 02:54:04 matt Exp $ */
#ifndef _HPPA_FLOAT_H_
#define _HPPA_FLOAT_H_
#ifdef _LP64
+#ifdef __LDBL_MANT_DIG__
+#define LDBL_MANT_DIG __LDBL_MANT_DIG__
+#else
#define LDBL_MANT_DIG 113
+#endif
+#ifdef __LDBL_EPSILON__
+#define LDBL_EPSILON __LDBL_EPSILON__
+#else
#define LDBL_EPSILON 1.925929944387235853055977942584927319E-34L
+#endif
+#ifdef __LDBL_DIG__
+#define LDBL_DIG __LDBL_DIG__
+#else
#define LDBL_DIG 33
+#endif
+#ifdef __LDBL_MIN_EXP__
+#define LDBL_MIN_EXP __LDBL_MIN_EXP__
+#else
#define LDBL_MIN_EXP (-16381)
+#endif
+#ifdef __LDBL_MIN__
+#define LDBL_MIN __LDBL_MIN__
+#else
#define LDBL_MIN 3.3621031431120935062626778173217526026E-4932L
+#endif
+#ifdef __LDBL_MIN_10_EXP__
+#define LDBL_MIN_10_EXP __LDBL_MIN_10_EXP__
+#else
#define LDBL_MIN_10_EXP (-4931)
+#endif
+#ifdef __LDBL_MAX_EXP__
+#define LDBL_MAX_EXP __LDBL_MAX_EXP__
+#else
#define LDBL_MAX_EXP 16384
+#endif
+#ifdef __LDBL_MAX__
+#define LDBL_MAX __LDBL_MAX__
+#else
#define LDBL_MAX 1.1897314953572317650857593266280070162E4932L
+#endif
+#ifdef __LDBL_MAX_10_EXP__
+#define LDBL_MAX_10_EXP __LDBL_MAX_10_EXP__
+#else
#define LDBL_MAX_10_EXP 4932
#endif
+#endif
#include <sys/float_ieee754.h>
Index: src/sys/arch/hppa/include/limits.h
diff -u src/sys/arch/hppa/include/limits.h:1.12 src/sys/arch/hppa/include/limits.h:1.13
--- src/sys/arch/hppa/include/limits.h:1.12 Mon Jun 7 13:52:30 2010
+++ src/sys/arch/hppa/include/limits.h Mon Jul 11 02:54:04 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.12 2010/06/07 13:52:30 tnozaki Exp $ */
+/* $NetBSD: limits.h,v 1.13 2011/07/11 02:54:04 matt Exp $ */
/* $OpenBSD: limits.h,v 1.2 2000/07/31 20:06:02 millert Exp $ */
@@ -117,13 +117,54 @@
#define LONG_BIT 32
#define WORD_BIT 32
+#ifndef DBL_DIG
+#ifdef __DBL_DIG__
+#define DBL_DIG __DBL_DIG__
+#else
#define DBL_DIG 15
+#endif
+#endif
+
+#ifndef DBL_MAX
+#ifdef __DBL_MAX__
+#define DBL_MAX __DBL_MAX__
+#else
#define DBL_MAX 1.7976931348623157E+308
+#endif
+#endif
+
+#ifndef DBL_MIN
+#ifdef __DBL_MIN__
+#define DBL_MIN __DBL_MIN__
+#else
#define DBL_MIN 2.2250738585072014E-308
+#endif
+#endif
+#ifndef FLT_DIG
+#ifdef __FLT_DIG__
+#define FLT_DIG __FLT_DIG__
+#else
#define FLT_DIG 6
+#endif
+#endif
+
+#ifndef FLT_MAX
+#ifdef __FLT_MAX__
+#define FLT_MAX __FLT_MAX__
+#else
#define FLT_MAX 3.40282347E+38F
+#endif
+#endif
+
+#ifndef FLT_MIN
+#ifdef __FLT_MIN__
+#define FLT_MIN __FLT_MIN__
+#else
#define FLT_MIN 1.17549435E-38F
#endif
+#endif
+
+#endif
#endif /* _MACHINE_LIMITS_H_ */
