diff options
author | guenther <> | 2017-09-05 02:40:54 +0000 |
---|---|---|
committer | guenther <> | 2017-09-05 02:40:54 +0000 |
commit | c1d0fec9b838e4df93e396d54f1e4b9a41f7401a (patch) | |
tree | 32e0f60be3ce027e6df050bdc53fc50cad03781e /src/lib/libc/include/cancel.h | |
parent | ec1b9739d1881112264d7fe9aac0d7924e149b28 (diff) | |
download | openbsd-c1d0fec9b838e4df93e396d54f1e4b9a41f7401a.tar.gz openbsd-c1d0fec9b838e4df93e396d54f1e4b9a41f7401a.tar.bz2 openbsd-c1d0fec9b838e4df93e396d54f1e4b9a41f7401a.zip |
Move mutex, condvar, and thread-specific data routes, pthread_once, and
pthread_exit from libpthread to libc, along with low-level bits to
support them. Major bump to both libc and libpthread.
Requested by libressl team. Ports testing by naddy@
ok kettenis@
Diffstat (limited to 'src/lib/libc/include/cancel.h')
-rw-r--r-- | src/lib/libc/include/cancel.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/libc/include/cancel.h b/src/lib/libc/include/cancel.h index 2c87be39e3..c452bf3d4c 100644 --- a/src/lib/libc/include/cancel.h +++ b/src/lib/libc/include/cancel.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: cancel.h,v 1.4 2017/04/20 17:16:32 visa Exp $ */ | 1 | /* $OpenBSD: cancel.h,v 1.5 2017/09/05 02:40:54 guenther Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org> | 3 | * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org> |
4 | * | 4 | * |
@@ -21,10 +21,12 @@ | |||
21 | #include <tib.h> | 21 | #include <tib.h> |
22 | #include "thread_private.h" | 22 | #include "thread_private.h" |
23 | 23 | ||
24 | __BEGIN_HIDDEN_DECLS | ||
25 | /* process a cancel request at a cancel point */ | 24 | /* process a cancel request at a cancel point */ |
26 | __dead void _thread_canceled(void); | 25 | __dead void _thread_canceled(void); |
27 | __END_HIDDEN_DECLS | 26 | |
27 | #ifdef __LIBC__ | ||
28 | PROTO_NORMAL(_thread_canceled); | ||
29 | #endif | ||
28 | 30 | ||
29 | #if defined(__LIBC__) && !defined(TCB_HAVE_MD_GET) | 31 | #if defined(__LIBC__) && !defined(TCB_HAVE_MD_GET) |
30 | /* | 32 | /* |