--- sun-java/stubs/include/typedefs_md.h.orig	Tue Mar 31 22:24:23 1998
+++ sun-java/stubs/include/typedefs_md.h	Tue Mar 31 22:33:46 1998
@@ -23,19 +23,6 @@
 
 PR_BEGIN_EXTERN_C
 
-#if (defined(__sun) && !defined(SOLARIS2_6)) || defined(HPUX9) || defined(HPUX10_10) || defined(XP_PC) || defined(AIX) || defined(OSF1) || defined(XP_MAC) || defined(SONY) || defined(SNI) || defined(UNIXWARE) || defined(LINUX)
-typedef int16 int16_t;
-typedef int32 int32_t;
-#endif
-
-#if !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11)
-typedef uint16 uint16_t;
-#ifndef	_UINT32_T
-#define	_UINT32_T
-typedef uint32 uint32_t;
-#endif /* _UINT32_T */
-#endif /* !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(SOLARIS2_6) */
-
 typedef prword_t uintVP_t; /* unsigned that is same size as a void pointer */
 
 #if !defined(BSDI) && !defined(IRIX6_2) && !defined(IRIX6_3) && !defined(LINUX2_0) && !defined(MACLINUX) && !defined(SOLARIS2_6) && !defined(HPUX10_20) && !defined(HPUX10_30) && !defined(HPUX11)
@@ -60,10 +47,6 @@
 										least bad given the alternatives. */
 	#endif /* __OPENTRANSPORT__ */
 	#pragma warning_errors reset
-#endif
-
-#if defined(XP_PC)
-typedef long int32_t;
 #endif
 
 PR_END_EXTERN_C
