diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-11-07 00:43:08 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-11-07 00:43:08 +0000 |
| commit | 632b6761c348150e018c42ee06265794668d9180 (patch) | |
| tree | b5527858c05c5f081f1a856a07e2d66baab9aeec /linuxthreads | |
| parent | 1324affa186eff814fde274a524a57b611ce71be (diff) | |
Update.
2000-11-06 Ulrich Drepper <drepper@redhat.com>
* iconvdata/big5.c: Regenerated after BIG5 charmap change.
Patch by Tung-Han Hsieh <thhsieh@twcpro.phys.ntu.edu.tw>.
* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Fix typo in
comparison with new cache magic bytes.
Patch by Denis Zaitsev <zzz@cd-club.ru>.
2000-11-03 Bruno Haible <haible@clisp.cons.org>
* locale/C-translit.h.in: Update from translit_neutral.
* locale/C-translit.h: Regenerated.
* intl/tst-translit.c: Update.
Diffstat (limited to 'linuxthreads')
| -rw-r--r-- | linuxthreads/ChangeLog | 6 | ||||
| -rw-r--r-- | linuxthreads/cancel.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/linuxthreads/ChangeLog b/linuxthreads/ChangeLog index 52230cd76f..830784194b 100644 --- a/linuxthreads/ChangeLog +++ b/linuxthreads/ChangeLog @@ -1,3 +1,9 @@ +2000-11-06 Ulrich Drepper <drepper@redhat.com> + + * cancel.c (pthread_cancel): Always set p_canceled, even if we are + not doing it right now. + Reported by Kaz Kylheku <kaz@ashi.footprints.net>. + 2000-10-30 Ulrich Drepper <drepper@redhat.com> * Examples/ex4.c (main): Don't use exit() to avoid warning with diff --git a/linuxthreads/cancel.c b/linuxthreads/cancel.c index 370a373c77..40f9db5302 100644 --- a/linuxthreads/cancel.c +++ b/linuxthreads/cancel.c @@ -65,6 +65,7 @@ int pthread_cancel(pthread_t thread) th = handle->h_descr; if (th->p_cancelstate == PTHREAD_CANCEL_DISABLE || th->p_canceled) { + th->p_canceled = 1; __pthread_unlock(&handle->h_lock); return 0; } |