diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-09 11:42:31 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-09 11:42:31 -0700 |
| commit | 762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a (patch) | |
| tree | 7b2fe40a89bf327ea8b9ad8265a6b6f27cacd2a7 /src/term.c | |
| parent | eb3f1cc8dfe6a96505f1c5f9174b2712998cb52f (diff) | |
| parent | 8546720e6f25eb988e8215de6678798053031440 (diff) | |
Merge from mainline.
Diffstat (limited to 'src/term.c')
| -rw-r--r-- | src/term.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/term.c b/src/term.c index d4e5faf01c..ea856543a7 100644 --- a/src/term.c +++ b/src/term.c @@ -3155,13 +3155,12 @@ init_tty (const char *name, const char *terminal_type, int must_succeed) if we don't have one at the moment. */ fd = emacs_open (name, O_RDWR | O_IGNORE_CTTY | O_NOCTTY, 0); else -#else +#endif /* O_IGNORE_CTTY */ /* Alas, O_IGNORE_CTTY is a GNU extension that seems to be only defined on Hurd. On other systems, we need to explicitly dissociate ourselves from the controlling tty when we want to open a frame on the same terminal. */ fd = emacs_open (name, O_RDWR | O_NOCTTY, 0); -#endif /* O_IGNORE_CTTY */ tty->name = xstrdup (name); terminal->name = xstrdup (name); |