diff options
| author | Christopher Faylor <me@cgf.cx> | 2006-01-02 05:55:14 +0300 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2006-01-02 05:55:14 +0300 |
| commit | 7a32aefe7947e819af953998ea51bdd700195daa (patch) | |
| tree | e7ec696ee4ad19dcb232ddd6c78c3d1b79cd585c /winsup | |
| parent | 74c29a5e9a63d106feee043f2f6b110979086e67 (diff) | |
* cygtls.cc (_cygtls::remove): Remove left over debugging cruft which caused
this function to always return prematurely.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/cygtls.cc | 2 | ||||
| -rw-r--r-- | winsup/cygwin/strace.cc | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9dee41b2f..52a0fff06 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2006-01-01 Christopher Faylor <cgf@timesys.com> + * cygtls.cc (_cygtls::remove): Remove left over debugging cruft which + caused this function to always return prematurely. + +2006-01-01 Christopher Faylor <cgf@timesys.com> + * exceptions.cc (sigpacket::process): Pass actual reference to signal's sigaction structure to setup_handler. diff --git a/winsup/cygwin/cygtls.cc b/winsup/cygwin/cygtls.cc index e27fe1e83..23415669a 100644 --- a/winsup/cygwin/cygtls.cc +++ b/winsup/cygwin/cygtls.cc @@ -147,7 +147,7 @@ void _cygtls::remove (DWORD wait) { debug_printf ("wait %p", wait); - if (1 || !isinitialized () || !locals.exitsock || exit_state >= ES_FINAL) + if (!isinitialized () || !locals.exitsock || exit_state >= ES_FINAL) return; if (wait) { diff --git a/winsup/cygwin/strace.cc b/winsup/cygwin/strace.cc index 9e5929632..779183c53 100644 --- a/winsup/cygwin/strace.cc +++ b/winsup/cygwin/strace.cc @@ -223,9 +223,7 @@ strace::write_childpid (child_info& ch, DWORD pid) if (!attached () || !being_debugged ()) return; -int res = WaitForSingleObject (ch.subproc_ready, 30000); -do { if ((0x00040 & 0x08000) || active ()) prntf (0x00040, __PRETTY_FUNCTION__, "res %d", res); } while (0); __small_sprintf (buf, "cYg%8x %x", _STRACE_CHILD_PID, pid); OutputDebugString (buf); } |