diff options
author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-15 12:35:24 +0000 |
---|---|---|
committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2020-01-15 12:35:24 +0000 |
commit | 0e6c921499ae7b69ddacef08cedbe2dbc597bc72 (patch) | |
tree | a86b62ad8ae353236485fc2a9f87887629eaf461 /usr/src/lib/libc/inc/libc.h | |
parent | b8a2ac4c2cdd0c26c705976b7ea699f6951d9e05 (diff) | |
parent | e25cb0e77ab84d3147918b8aef1f5161fbccb30e (diff) | |
download | illumos-joyent-0e6c921499ae7b69ddacef08cedbe2dbc597bc72.tar.gz |
[illumos-gate merge]
commit e25cb0e77ab84d3147918b8aef1f5161fbccb30e
11967 need TAA mitigation
commit b666b5bebdde1067e2d0f2b91fd28a5243311a1a
12165 lp: argument to 'alloca' may be too large
commit dd2ed563fd8f7f157d5cd583cae81fef585c2ffc
12151 libc: specifies less restrictive attribute than its target
commit e830fb12ed60bbd91c87459b169b5d1cc6ef0b9e
10241 ZFS not detecting faulty spares in a timely manner
12132 zfs-retire agent crashes fmd on systems without vdev devids
12034 zfs test send_encrypted_props can fail
commit 356ce177517a15babb8fd801d490f239298643b7
12178 Allow bytes to be removed from a custr
Conflicts:
usr/src/uts/intel/sys/x86_archext.h
usr/src/uts/common/fs/zfs/spa_misc.c
usr/src/test/util-tests/tests/Makefile
Diffstat (limited to 'usr/src/lib/libc/inc/libc.h')
-rw-r--r-- | usr/src/lib/libc/inc/libc.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/usr/src/lib/libc/inc/libc.h b/usr/src/lib/libc/inc/libc.h index 3d440ab2e2..448523df01 100644 --- a/usr/src/lib/libc/inc/libc.h +++ b/usr/src/lib/libc/inc/libc.h @@ -50,6 +50,7 @@ #include <wchar.h> #include <wctype.h> #include <libnvpair.h> +#include <setjmp.h> #ifdef __cplusplus extern "C" { @@ -61,6 +62,7 @@ extern long _sysconfig(int); extern int kill(pid_t pid, int sig); extern int primary_link_map; +extern void _thr_exit(void *) __NORETURN; extern int thr_main(void); extern int thr_kill(thread_t tid, int sig); extern thread_t thr_self(void); @@ -195,6 +197,11 @@ extern char *getusershell(void); extern int __sigaction(int, const struct sigaction *, struct sigaction *); /* + * defined in siglongjmp.c + */ +extern void _siglongjmp(sigjmp_buf, int) __NORETURN; + +/* * defined in _getsp.s */ extern greg_t _getsp(void); |