diff options
| author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-07-12 09:40:07 +0000 |
|---|---|---|
| committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-07-12 09:40:07 +0000 |
| commit | f0d1fe2f0532a08fe76e0cecf2d0f2ce73dc58c4 (patch) | |
| tree | 931abde5129620f071a998718113844f59074ba5 /libjava | |
| parent | 18f13b5d1548d19bf2533be04a15bce19788c856 (diff) | |
| download | ppe42-gcc-f0d1fe2f0532a08fe76e0cecf2d0f2ce73dc58c4.tar.gz ppe42-gcc-f0d1fe2f0532a08fe76e0cecf2d0f2ce73dc58c4.zip | |
* java/lang/mprec.h: Protect definition of uint32_t with #ifndef
_UINT32_T.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@28065 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/java/lang/mprec.h | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index c7536be7429..3cb973189f3 100644 --- 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-07 Andrew Haley <aph@cygnus.com> * include/i386-signal.h (MAKE_THROW_FRAME): Advance EIP by two diff --git a/libjava/java/lang/mprec.h b/libjava/java/lang/mprec.h index 7989075aac3..fbfba4c3ba0 100644 --- a/libjava/java/lang/mprec.h +++ b/libjava/java/lang/mprec.h @@ -61,7 +61,13 @@ typedef u_int32_t uint32_t; #if !defined HAVE_BSD_INT32_DEFINED && !defined HAVE_INT32_DEFINED // FIXME -- this could have problems with systems that don't define SI to be 4 typedef int int32_t __attribute__((mode(SI))); + +/* 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 typedef unsigned int uint32_t __attribute__((mode(SI))); +# endif #endif /* These typedefs are true for the targets running Java. */ |
