From: Svante Signell <svante.signell@telia.com>
Date: Fri, 8 Apr 2011 18:44:36 +0000 (-0400)
Subject: * term.c (init_tty): Fix incorrect ifdef placement (Bug#8450).
X-Git-Tag: emacs-pretest-24.0.90~104^3~86
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0080dc6bd919f83c036bb6072800032b1723b248;p=emacs.git

* term.c (init_tty): Fix incorrect ifdef placement (Bug#8450).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 728b215b9ec..5e92b45b9d0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2011-04-08  Svante Signell  <svante.signell@telia.com>  (tiny change)
+
+	* term.c (init_tty): Fix incorrect ifdef placement (Bug#8450).
+
 2011-03-19  Christoph Scholtes  <cschol2112@googlemail.com>
 
 	* process.c (Fformat_network_address): Doc fix.
diff --git a/src/term.c b/src/term.c
index 6d16a65674b..44e127e7154 100644
--- a/src/term.c
+++ b/src/term.c
@@ -3413,13 +3413,12 @@ init_tty (char *name, 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);