Index: j2se/src/solaris/javavm/include/typedefs_md.h
===================================================================
--- j2se/src/solaris/javavm/include/typedefs_md.h	(Revision 254)
+++ j2se/src/solaris/javavm/include/typedefs_md.h	(Arbeitskopie)
@@ -70,7 +70,7 @@
 #endif	/* LONG_IS_64 */
 #endif /* don't HAVE_INTPTR_T */
 
-#ifndef	_UINT64_T
+#if ! defined _UINT64_T && ! defined HAVE_UINT64_DEFINED
 #define	_UINT64_T
 #ifdef LONG_IS_64
 typedef unsigned long uint64_t;
@@ -78,7 +78,7 @@
 typedef unsigned long long uint64_t;
 #endif
 #define _UINT32_T
-#ifndef uint32_t /* [sbb] scaffolding */
+#if ! defined uint32_t && ! defined HAVE_UINT32_DEFINED /* [sbb] scaffolding */
 typedef unsigned int uint32_t;
 #endif /* [sbb] scaffolding */
 #if defined(__linux__)
@@ -88,7 +88,7 @@
 
 #ifndef __BIT_TYPES_DEFINED__
 /* that should get Linux, at least */
-#ifndef	_INT64_T
+#if ! defined _INT64_T && ! defined HAVE_INT64_DEFINED
 #define	_INT64_T
 #ifdef LONG_IS_64
 typedef long int64_t;
@@ -96,7 +96,7 @@
 typedef long long int64_t;
 #endif
 #define _INT32_T
-#ifndef int32_t /* [sbb] scaffolding */
+#if ! defined int32_t && ! defined HAVE_INT32_DEFINED /* [sbb] scaffolding */
 typedef int int32_t;
 #endif /* [sbb] scaffolding */
 #if defined(__linux__)