about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2004-03-01 11:50:50 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2004-03-01 11:50:50 +0000
commitb8859fefcc3f455e666233dc95f4097405240f88 (patch)
tree0d3b1ad00829f25361e3ea1ebcd9445a0987cb28
parentdc3fa4b40761a40b506364dc89842efc7892bc70 (diff)
downloadzsh-b8859fefcc3f455e666233dc95f4097405240f88.tar.gz
zsh-b8859fefcc3f455e666233dc95f4097405240f88.tar.xz
zsh-b8859fefcc3f455e666233dc95f4097405240f88.zip
19505: compilation with NTTYDISC defined was broken.
-rw-r--r--ChangeLog5
-rw-r--r--Src/init.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f744eb521..d0b5ef3b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-03-01  Peter Stephenson  <pws@csr.com>
+
+	* 19505: Src/init.c: compilation with NTTYDISC defined was
+	broken.
+
 2004-02-29  Doug Kearns  <djkea2@mugca.its.monash.edu.au>
 
 	* unposted: Doc/Zsh/compsys.yo: fix typo
diff --git a/Src/init.c b/Src/init.c
index 15e7f9c60..9591671da 100644
--- a/Src/init.c
+++ b/Src/init.c
@@ -481,6 +481,9 @@ mod_export void
 init_shout(void)
 {
     static char shoutbuf[BUFSIZ];
+#if defined(JOB_CONTROL) && defined(TIOCSETD) && defined(NTTYDISC)
+    int ldisc;
+#endif
 
     if (SHTTY == -1)
     {
@@ -490,8 +493,7 @@ init_shout(void)
     }
 
 #if defined(JOB_CONTROL) && defined(TIOCSETD) && defined(NTTYDISC)
-    int ldisc = NTTYDISC;
-
+    ldisc = NTTYDISC;
     ioctl(SHTTY, TIOCSETD, (char *)&ldisc);
 #endif