summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog6
-rw-r--r--winsup/cygwin/fhandler_tty.cc4
2 files changed, 8 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 39317a2d2..51eb4860a 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,11 @@
2005-12-29 Christopher Faylor <cgf@timesys.com>
+ * fhandler_tty.cc (fhandler_tty_common::__acquire_output_mutex): Use
+ strace method rather than accessing field directly.
+ (fhandler_tty_common::__release_output_mutex): Ditto.
+
+2005-12-29 Christopher Faylor <cgf@timesys.com>
+
* child_info.h (CURR_CHILD_INFO_MAGIC): Reset.
(child_info::dwProcessId): Delete.
(child_info::straced): New variable.
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 6d95ab13a..c9d96a4b1 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -118,7 +118,7 @@ fhandler_tty_common::__acquire_output_mutex (const char *fn, int ln,
if (res == WAIT_OBJECT_0)
{
#ifndef DEBUGGING
- if (strace.active)
+ if (strace.active ())
strace.prntf (_STRACE_TERMIOS, fn, "(%d): tty output_mutex: acquired", ln, res);
#else
ostack[osi].fn = fn;
@@ -137,7 +137,7 @@ fhandler_tty_common::__release_output_mutex (const char *fn, int ln)
if (ReleaseMutex (output_mutex))
{
#ifndef DEBUGGING
- if (strace.active)
+ if (strace.active ())
strace.prntf (_STRACE_TERMIOS, fn, "(%d): tty output_mutex released", ln);
#else
if (osi > 0)