Changes for SGI from Matthew J Brown <mjb@doc.ic.ac.uk>.

	* m/iris4d.h, m/iris5d.h: Don't use the --cckr CC switch if we're
	using GCC.
	(NEED_SIOCTL): Move this to...
	* s/irix3-3.h (NEED_SIOCTL): ... here; apparently it's not
	necessary in irix4-0.h.
	* s/irix4-0.h: Remove declaration of getpty; apparently Irix 4.0
	already declares this elsewhere.
	(PTY_TTY_NAME_SPRINTF): #undef this before re-#defining it.
	* m/ibmps2-aix.h, m/pfa50.h, s/hpux.h, s/isc2-2.h, s/linux.h,
	s/sco4.h, s/usg5-4.h: Remove HAVE_RENAME; configure guesses that now.

	* m/iris4d.h, m/iris5d.h: Don't use the --cckr CC switch if we're
	using GCC.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/m/iris5d.h b/src/m/iris5d.h
index dd41d312355..da163e62595 100644
--- a/src/m/iris5d.h
+++ b/src/m/iris5d.h
@@ -190,6 +190,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define XSETMARKBIT(a,b) ((a) = ((a) & ~MARKBIT) | ((b) ? MARKBIT : 0))
 #define XUNMARK(a) ((a) = (((unsigned)(a) << INTBITS-GCTYPEBITS-VALBITS) >> INTBITS-GCTYPEBITS-VALBITS))
 
+#ifndef __GNUC__
 /* Turn off some "helpful" error checks for type mismatches
    that we can't fix without breaking other machines.  */
 #define C_SWITCH_MACHINE -cckr
+#endif