emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r108988: * src/s/irix6-5.h (SETUP_SLA


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r108988: * src/s/irix6-5.h (SETUP_SLAVE_PTY, PTY_NAME_SPRINTF): Drop ifdef guards.
Date: Mon, 09 Jul 2012 21:49:46 -0400
User-agent: Bazaar (2.5.0)

------------------------------------------------------------
revno: 108988
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2012-07-09 21:49:46 -0400
message:
  * src/s/irix6-5.h (SETUP_SLAVE_PTY, PTY_NAME_SPRINTF): Drop ifdef guards.
  We include usg5-4-common.h, which defines them both.
modified:
  src/ChangeLog
  src/s/irix6-5.h
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-10 01:33:53 +0000
+++ b/src/ChangeLog     2012-07-10 01:49:46 +0000
@@ -1,5 +1,8 @@
 2012-07-10  Glenn Morris  <address@hidden>
 
+       * s/irix6-5.h (SETUP_SLAVE_PTY, PTY_NAME_SPRINTF): Drop ifdef guards.
+       We include usg5-4-common.h, which defines them both.
+
        * s/gnu.h: Don't include fcntl.h (every file in Emacs that uses
        O_RDONLY already includes it).
 

=== modified file 'src/s/irix6-5.h'
--- a/src/s/irix6-5.h   2012-07-07 18:16:15 +0000
+++ b/src/s/irix6-5.h   2012-07-10 01:49:46 +0000
@@ -26,9 +26,7 @@
 
 #define SETPGRP_RELEASES_CTTY
 
-#ifdef SETUP_SLAVE_PTY
 #undef SETUP_SLAVE_PTY
-#endif
 
 /* address@hidden says this is needed.  */
 /* Make process_send_signal work by "typing" a signal character on the pty.  */
@@ -42,9 +40,7 @@
 /* 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.  */
-#ifdef PTY_NAME_SPRINTF
 #undef PTY_NAME_SPRINTF
-#endif
 #define PTY_NAME_SPRINTF
 #ifdef emacs
 char *_getpty();


reply via email to

[Prev in Thread] Current Thread [Next in Thread]