summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog4
-rw-r--r--winsup/cygwin/fhandler_tty.cc5
2 files changed, 6 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5d006112c..3772e4c16 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-02 Corinna Vinschen <corinna@vinschen.de>
+
+ * fhandler_tty.cc (fhandler_tty_slave::close): Revert previous change.
+
2010-04-02 Christopher Faylor <me+cygwin@cgf.cx>
* select.h (select_pipe_info::add_watch_handle): Delete declaration.
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 78e149ba4..7e8254c3c 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -629,11 +629,10 @@ fhandler_tty_slave::close ()
close this normally. cgf 2006-05-20 */
cygheap->manage_console_count ("fhandler_tty_slave::close", -1);
- if (archetype)
- archetype->usecount--;
+ archetype->usecount--;
report_tty_counts (this, "closed", "");
- if (archetype && archetype->usecount)
+ if (archetype->usecount)
{
#ifdef DEBUGGING
if (archetype->usecount < 0)