diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2006-02-22 17:06:14 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2006-02-22 17:06:14 +0000 |
| commit | 2eecb0478c16a0bd6122bab83d22e47ec4c65933 (patch) | |
| tree | 056c786413a48dea84aad55b8423f9f152116f35 | |
| parent | b65479ca2edb67be5ce209cbc6bf689f9c12480d (diff) | |
| download | cygnal-2eecb0478c16a0bd6122bab83d22e47ec4c65933.tar.gz cygnal-2eecb0478c16a0bd6122bab83d22e47ec4c65933.tar.bz2 cygnal-2eecb0478c16a0bd6122bab83d22e47ec4c65933.zip | |
* exceptions.cc (_cygtls::interrupt_now): Reorder conditional
to call inside_kernel only if this isn't locked.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/exceptions.cc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 9c5de1959..fac9a795e 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2006-02-22 Corinna Vinschen <corinna@vinschen.de> + * exceptions.cc (_cygtls::interrupt_now): Reorder conditional + to call inside_kernel only if this isn't locked. + +2006-02-22 Corinna Vinschen <corinna@vinschen.de> + * fhandler.cc (fhandler_base::open): Add FILE_READ_ATTRIBUTES to access flags in case of query_read_control case, add FILE_READ_DATA in case of query_stat_control. diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index cce217e87..33ba9f02d 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -726,7 +726,7 @@ _cygtls::interrupt_now (CONTEXT *cx, int sig, void *handler, { bool interrupted; - if (!inside_kernel (cx) || (incyg || spinning || locked ())) + if (incyg || spinning || locked () || !inside_kernel (cx)) interrupted = false; else { |