3 files changed, 14 insertions, 9 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5794311868d..f4fcb22b299 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2010-05-01  Dan Nicolaescu  <dann@ics.uci.edu>
 
+        Clean up IRIX code.
+        * m/iris4d.h (TERMINFO, FIRST_PTY_LETTER): Move definitions ...
+        * s/irix6-5.h (TERMINFO, FIRST_PTY_LETTER): ... here.
+
         Clean up AIX code.
         * m/ibmrs6000.inp: Remove file, unused.
         * m/ibmrs6000.h (IBMR2AIX): Remove, unused.
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index a5532fcf715..54ebcdf74bd 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -42,15 +42,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define DATA_START 0x10000000
 #define DATA_SEG_BITS   0x10000000
 
-/* Use terminfo instead of termcap.  */
-
-#define TERMINFO
-
-/* Letter to use in finding device name of first pty,
-  if system supports pty's.  'a' means it is /dev/ptya0  */
-
-#undef FIRST_PTY_LETTER
-#define FIRST_PTY_LETTER 'q'
 
 #if _MIPS_SZLONG != 64
 /* fixme: should there be 64-bit definitions?  (The ones below aren't OK.)  */
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 0a0b0d4af26..06252da6e80 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -44,6 +44,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Make process_send_signal work by "typing" a signal character on the pty.  */
 #define SIGNALS_VIA_CHARACTERS
 
+/* Use terminfo instead of termcap.  */
+
+#define TERMINFO
+
+/* Letter to use in finding device name of first pty,
+  if system supports pty's.  'a' means it is /dev/ptya0  */
+
+#undef FIRST_PTY_LETTER
+#define FIRST_PTY_LETTER 'q'
+
 /* No need to use sprintf to get the tty name--we get that from _getpty.  */
 #define PTY_TTY_NAME_SPRINTF
 /* No need to get the pty name at all.  */