--- a/src/s/irix6-0.h	Mon Aug 13 09:00:04 2007 +0200
+++ b/src/s/irix6-0.h	Mon Aug 13 09:02:59 2007 +0200
@@ -2,20 +2,17 @@
 
 #include "irix5-3.h"
 
-/* Irix 6.2 doesn't need -lw */
-#undef NEED_LIBW
-
-/* Irix 5 has this defined in inttypes.h, but you can't include
- * both inttypes.h and sys/types.h.  This is fixed by Irix 6.2. 
- * This should probably be set by configure.
- */
-#define HAVE_UINTPTR_T 1
+/* Irix 6 tries to do 64 bits, but doesn't do it fully,
+   so inhibit that.  */
+#define IRIX_FORCE_32_BITS
 
-/* R. Cognot 09/24/97
- * This may be needed for other ABIs, but at least I'm sure it is
- * is needed on n32, as purify reports UMRs in siglongjmp and 
- * xemacs dumps core every once in a while...
- */
-#if (_MIPS_SIM==_MIPS_SIM_ABIN32)
-#undef HAVE_SIGSETJMP
+#ifndef __GNUC__
+#define LD_SWITCH_SYSTEM -32
 #endif
+
+/* This macro definition, which we inherited from irix5-0.h,
+   is needed in configure on Irix 5, but gets in the way there
+   on Irix 6.  So get rid of it except in Makefile.in where we need it.  */
+#ifndef THIS_IS_MAKEFILE
+#undef C_SWITCH_SYSTEM
+#endif