aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2002-03-15 21:59:12 +0000
committerTom Tromey <tromey@gcc.gnu.org>2002-03-15 21:59:12 +0000
commit60f32585da3a529a5a6e03e30c2184ae8abc0f94 (patch)
tree9ac63d9a0f7bea77daaf8178f2f49bd688f7a2d9
parentfdffea1abb5dca21db50ad6e5c36ba3dfb301f7e (diff)
downloadgcc-60f32585da3a529a5a6e03e30c2184ae8abc0f94.zip
gcc-60f32585da3a529a5a6e03e30c2184ae8abc0f94.tar.gz
gcc-60f32585da3a529a5a6e03e30c2184ae8abc0f94.tar.bz2
re PR libgcj/5944 (Use of uint32_t breaks libgcj bootstrap on Solaris 2.5.1)
2002-03-15 Tom Tromey <tromey@redhat.com> Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> Fix for PR libgcj/5944. * gnu/gcj/io/shs.h: Define uint8_t and uint32_t. Co-Authored-By: Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> From-SVN: r50842
-rw-r--r--libjava/ChangeLog6
-rw-r--r--libjava/gnu/gcj/io/shs.h8
2 files changed, 14 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 8413354..11f0ef3 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-15 Tom Tromey <tromey@redhat.com>
+ Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
+ Fix for PR libgcj/5944.
+ * gnu/gcj/io/shs.h: Define uint8_t and uint32_t.
+
2002-03-15 Anthony Green <green@redhat.com>
* configure.in (tool_include_dir): Define.
diff --git a/libjava/gnu/gcj/io/shs.h b/libjava/gnu/gcj/io/shs.h
index 9b7bb24..1b435c5 100644
--- a/libjava/gnu/gcj/io/shs.h
+++ b/libjava/gnu/gcj/io/shs.h
@@ -20,6 +20,14 @@
#else
# if HAVE_STDINT_H
# include <stdint.h>
+# else
+typedef unsigned int uint8_t __attribute__((mode(QI)));
+/* 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
#endif