diff options
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/s/irix6-5.h | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 754f0caf9db..3b7038ffe49 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2012-07-10 Glenn Morris <rgm@gnu.org> + * 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). diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h index 30aca2b5416..212a6ffb839 100644 --- a/src/s/irix6-5.h +++ b/src/s/irix6-5.h @@ -26,9 +26,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #define SETPGRP_RELEASES_CTTY -#ifdef SETUP_SLAVE_PTY #undef SETUP_SLAVE_PTY -#endif /* thomas@mathematik.uni-bremen.de says this is needed. */ /* Make process_send_signal work by "typing" a signal character on the pty. */ @@ -42,9 +40,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ /* 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(); |