From: Tom Tromey Date: Mon, 12 Jul 1999 09:32:05 +0000 (+0000) Subject: mprec.h: Protect definition of uint32_t with #ifndef _UINT32_T. X-Git-Tag: releases/libgcj-2.95.0~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aaf40bbf4fb84282aeab5f769072e8fb3d9d766c;p=thirdparty%2Fgcc.git 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 a86c6d6ae57c..d8f54892b6b6 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +1999-07-12 Tom Tromey + + * java/lang/mprec.h: Protect definition of uint32_t with #ifndef + _UINT32_T. + 1999-07-08 Tom Tromey * mauve-libgcj: Omit InetAddressTest. Don't mention diff --git a/libjava/java/lang/mprec.h b/libjava/java/lang/mprec.h index 8bc8aefb9ea9..25112e8a351e 100644 --- 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)