diff options
| author | Glenn Morris | 2012-07-13 17:45:55 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-07-13 17:45:55 -0400 |
| commit | 33d63ff4db56fb6e2fad2ac145031fb7328d16f2 (patch) | |
| tree | 5d31179e7438a576449b3636796ff53b1d4c03b9 /src/s | |
| parent | 7f5b319886fac0bf379dada4a8c2cbd8dc4fe3c7 (diff) | |
| download | emacs-33d63ff4db56fb6e2fad2ac145031fb7328d16f2.tar.gz emacs-33d63ff4db56fb6e2fad2ac145031fb7328d16f2.zip | |
Move SETUP_SLAVE_PTY from src/s to configure
* configure.ac (SETUP_SLAVE_PTY): Move here from src/s.
(FIRST_PTY_LETTER, PTY_NAME_SPRINTF): Combine sol2/unixware cases.
* src/s/usg5-4-common.h (SETUP_SLAVE_PTY): Let configure set it.
* src/s/irix6-5.h (SETUP_SLAVE_PTY): No more need to unset it.
Diffstat (limited to 'src/s')
| -rw-r--r-- | src/s/irix6-5.h | 2 | ||||
| -rw-r--r-- | src/s/usg5-4-common.h | 8 |
2 files changed, 0 insertions, 10 deletions
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/>. */ | |||
| 22 | #undef _longjmp /* use system versions, not conservative aliases */ | 22 | #undef _longjmp /* use system versions, not conservative aliases */ |
| 23 | #undef _setjmp | 23 | #undef _setjmp |
| 24 | 24 | ||
| 25 | #undef SETUP_SLAVE_PTY | ||
| 26 | |||
| 27 | #ifdef emacs | 25 | #ifdef emacs |
| 28 | char *_getpty(); | 26 | char *_getpty(); |
| 29 | #endif | 27 | #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/>. */ | |||
| 52 | this is all we need. */ | 52 | this is all we need. */ |
| 53 | #define TIOCSIGSEND TIOCSIGNAL | 53 | #define TIOCSIGSEND TIOCSIGNAL |
| 54 | 54 | ||
| 55 | /* Push various streams modules onto a PTY channel. */ | ||
| 56 | #define SETUP_SLAVE_PTY \ | ||
| 57 | if (ioctl (xforkin, I_PUSH, "ptem") == -1) \ | ||
| 58 | fatal ("ioctl I_PUSH ptem"); \ | ||
| 59 | if (ioctl (xforkin, I_PUSH, "ldterm") == -1) \ | ||
| 60 | fatal ("ioctl I_PUSH ldterm"); \ | ||
| 61 | if (ioctl (xforkin, I_PUSH, "ttcompat") == -1) \ | ||
| 62 | fatal ("ioctl I_PUSH ttcompat"); | ||