projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revert hacks for types of stdint.h integer constant macros
[musl]
/
src
/
thread
/
cancel_impl.c
diff --git
a/src/thread/cancel_impl.c
b/src/thread/cancel_impl.c
index
01f52b8
..
7652a7c
100644
(file)
--- a/
src/thread/cancel_impl.c
+++ b/
src/thread/cancel_impl.c
@@
-17,7
+17,7
@@
long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
uintptr_t old_sp, old_ip;
long r;
uintptr_t old_sp, old_ip;
long r;
- if (!libc.
threade
d || (self = __pthread_self())->canceldisable)
+ if (!libc.
main_threa
d || (self = __pthread_self())->canceldisable)
return __syscall(nr, u, v, w, x, y, z);
old_sp = self->cp_sp;
return __syscall(nr, u, v, w, x, y, z);
old_sp = self->cp_sp;
@@
-61,7
+61,7
@@
static void cancel_handler(int sig, siginfo_t *si, void *ctx)
void __testcancel()
{
void __testcancel()
{
- pthread_t self =
__
pthread_self();
+ pthread_t self = pthread_self();
if (self->cancel && !self->canceldisable)
__cancel();
}
if (self->cancel && !self->canceldisable)
__cancel();
}