From a70486d79003622adf4b607344bc54b032393fc3 Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Mon, 24 Jun 2002 20:03:38 +0000
Subject: [PATCH] 2002-06-24  Jeff Johnston  <jjohnstn@redhat.com>

        * libc/include/math.h: Remove <sys/types.h>.
        (__dmath): Use __ULong instead of _uint32_t.
        * libc/include/sys/reent.h: If long or int is not 32-bits,
        include <sys/types.h> to get definitions for _int32_t and _uint32_t.
        * libc/stdlib/mprec.h: Include <sys/types.h> to get integer defs.
        * libm/common/fdlibm.h: Ditto.
---
 newlib/ChangeLog                | 9 +++++++++
 newlib/libc/include/math.h      | 3 +--
 newlib/libc/include/sys/reent.h | 1 +
 newlib/libc/stdlib/mprec.h      | 1 +
 newlib/libm/common/fdlibm.h     | 1 +
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index ee07774d0..60b4bbfa5 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,12 @@
+2002-06-24  Jeff Johnston  <jjohnstn@redhat.com>
+
+	* libc/include/math.h: Remove <sys/types.h>.
+	(__dmath): Use __ULong instead of _uint32_t.
+	* libc/include/sys/reent.h: If long or int is not 32-bits,
+	include <sys/types.h> to get definitions for _int32_t and _uint32_t.
+	* libc/stdlib/mprec.h: Include <sys/types.h> to get integer defs.
+	* libm/common/fdlibm.h: Ditto.
+
 2002-06-24  Thomas Fitzsimmons  <fitzsim@redhat.com>
 
 	* libc/include/ndbm.h: Remove.
diff --git a/newlib/libc/include/math.h b/newlib/libc/include/math.h
index 817e81183..c0a743d0f 100644
--- a/newlib/libc/include/math.h
+++ b/newlib/libc/include/math.h
@@ -7,7 +7,6 @@ extern "C" {
 #define  _MATH_H_
 
 #include <sys/reent.h>
-#include <sys/types.h>
 #include <machine/ieeefp.h>
 #include "_ansi.h"
 
@@ -18,7 +17,7 @@ extern "C" {
 
 union __dmath
 {
-  __uint32_t i[2];
+  __ULong i[2];
   double d;
 };
 
diff --git a/newlib/libc/include/sys/reent.h b/newlib/libc/include/sys/reent.h
index 39353cc42..f75684cdf 100644
--- a/newlib/libc/include/sys/reent.h
+++ b/newlib/libc/include/sys/reent.h
@@ -24,6 +24,7 @@ typedef unsigned __Long __ULong;
 #endif
 
 #ifndef __Long
+#include <sys/types.h>
 #define __Long __int32_t
 typedef __uint32_t __ULong;
 #endif
diff --git a/newlib/libc/stdlib/mprec.h b/newlib/libc/stdlib/mprec.h
index 31d52e131..4ca48f22f 100644
--- a/newlib/libc/stdlib/mprec.h
+++ b/newlib/libc/stdlib/mprec.h
@@ -31,6 +31,7 @@
 #include <float.h>
 #include <errno.h>
 #include <sys/config.h>
+#include <sys/types.h>
 
 #ifdef __IEEE_LITTLE_ENDIAN
 #define IEEE_8087
diff --git a/newlib/libm/common/fdlibm.h b/newlib/libm/common/fdlibm.h
index cb18bd99b..fc8e61716 100644
--- a/newlib/libm/common/fdlibm.h
+++ b/newlib/libm/common/fdlibm.h
@@ -13,6 +13,7 @@
 
 /* REDHAT LOCAL: Include files.  */
 #include <math.h>
+#include <sys/types.h>
 #include <machine/ieeefp.h>
 
 /* REDHAT LOCAL: Default to XOPEN_MODE.  */