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.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index 038a8f3e37a..200ab5d5c44 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -183,6 +183,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
diff --git a/src/s/irix4-0.h b/src/s/irix4-0.h
index 7f8cb356ee6..2002143042b 100644
--- a/src/s/irix4-0.h
+++ b/src/s/irix4-0.h
@@ -21,12 +21,10 @@
 #define WNOHANG         0x1
 
 /* No need to use sprintf to get the tty name--we get that from _getpty.  */
+#undef PTY_TTY_NAME_SPRINTF
 #define PTY_TTY_NAME_SPRINTF
 /* No need to get the pty name at all.  */
 #define PTY_NAME_SPRINTF
-#ifdef emacs
-char *_getpty();
-#endif
 /* We need only try once to open a pty.  */
 #define PTY_ITERATION
 /* Here is how to do it.  */