mprec.h: Protect definition of uint32_t with #ifndef _UINT32_T.

	* java/lang/mprec.h: Protect definition of uint32_t with #ifndef
	_UINT32_T.

From-SVN: r28064

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index a86c6d6ae57c5306fc04e252edeac0f1b34fbf27..d8f54892b6b68d9e1d56e1a22a9eb080520ced71 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+1999-07-12  Tom Tromey  <tromey@cygnus.com>
+
+       * java/lang/mprec.h: Protect definition of uint32_t with #ifndef
+       _UINT32_T.
+
 1999-07-08  Tom Tromey  <tromey@cygnus.com>
 
        * mauve-libgcj: Omit InetAddressTest.  Don't mention

diff --git a/libjava/java/lang/mprec.h b/libjava/java/lang/mprec.h
index 8bc8aefb9ea9644631837c241a9bf07b8fb4b99c..25112e8a351e136d9edacb9cd14a57daaafaa152 100644 (file)
--- a/libjava/java/lang/mprec.h
+++ b/libjava/java/lang/mprec.h
@@ -61,7 +61,13 @@ typedef unsigned int uint32_t __attribute__((mode(SI)));
 #define Bndry_mask1 ((uint32_t)0xffffffL)
 #define Sign_bit ((uint32_t)0x80000000L)
 #define Tiny0 ((uint32_t)0x100000L)
+
+/* This is a blatant hack: on Solaris 2.5, pthread.h defines uint32_t
+   in pthread.h, which we sometimes include.  We protect our
+   definition the same way Solaris 2.5 does, to avoid redefining it.  */
+#  ifndef _UINT32_T
 #define Exp_msk11   ((uint32_t)0x800000L)
+#  endif
 #define Exp_mask  ((uint32_t)0x7f80L)
 #define Exp_1  ((uint32_t)0x40800000L)
 #define Exp_11 ((uint32_t)0x4080L)