3 files changed, 5 insertions, 10 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4a7c481b8b1..9f26c236fed 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-13  Glenn Morris  <rgm@gnu.org>
+
+        * s/usg5-4-common.h (SETUP_SLAVE_PTY): Let configure set it.
+        * s/irix6-5.h (SETUP_SLAVE_PTY): No more need to unset it.
+
 2012-07-13  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (uRect): Only define if NS_IMPL_GNUSTEP.
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index a7365a76a91..1d1989ad9ac 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -22,8 +22,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #undef _longjmp /* use system versions, not conservative aliases */
 #undef _setjmp
 
-#undef SETUP_SLAVE_PTY
-
 #ifdef emacs
 char *_getpty();
 #endif
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 93a05ebec54..6ead01d3712 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -52,11 +52,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    this is all we need.  */
 #define TIOCSIGSEND TIOCSIGNAL
 
-/* Push various streams modules onto a PTY channel.  */
-#define SETUP_SLAVE_PTY \
-  if (ioctl (xforkin, I_PUSH, "ptem") == -1)    \
-    fatal ("ioctl I_PUSH ptem");                \
-  if (ioctl (xforkin, I_PUSH, "ldterm") == -1)  \
-    fatal ("ioctl I_PUSH ldterm");      \
-  if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \
-    fatal ("ioctl I_PUSH ttcompat");