[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100540: * term.c (init_tty): Fix incorrect ifdef placement (Bug#8450).

[Chong Yidong]

------------------------------------------------------------
revno: 100540
author: Svante Signell <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Fri 2011-04-08 14:44:36 -0400
message:
  * term.c (init_tty): Fix incorrect ifdef placement (Bug#8450).
modified:
  src/ChangeLog
  src/term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-03-19 18:47:17 +0000
+++ b/src/ChangeLog     2011-04-08 18:44:36 +0000
@@ -1,3 +1,7 @@
+2011-04-08  Svante Signell  <address@hidden>  (tiny change)
+
+       * term.c (init_tty): Fix incorrect ifdef placement (Bug#8450).
+
 2011-03-19  Christoph Scholtes  <address@hidden>
 
        * process.c (Fformat_network_address): Doc fix.

=== modified file 'src/term.c'
--- a/src/term.c        2011-01-02 23:50:46 +0000
+++ b/src/term.c        2011-04-08 18:44:36 +0000
@@ -3413,13 +3413,12 @@
          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);