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

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 841335430073cbdd88b4e42f8aada48aaea22316..11f0ef3112f0b9456a207eeb1f8589b0812a5ec5 100644 (file)
--- 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 9b7bb2462c5debe6e673fb9c5b78c11b08ee51f1..1b435c5df8e3562bf92e9ba70b7c5774c9717b3f 100644 (file)
--- 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