diff options
| author | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-12-08 13:03:18 +0000 |
|---|---|---|
| committer | Jerry Jelinek <jerry.jelinek@joyent.com> | 2015-12-08 13:03:18 +0000 |
| commit | ca8beeb64ffb099a0fa69ec946e7d1c284b1fc3f (patch) | |
| tree | c58ab28cfca7039cafd5516e46d12332675fa0fa /usr/src/lib/libc | |
| parent | 2ab4f0b80dd6c4db6c4dc192af969103074015b6 (diff) | |
| parent | bc0e91320069f0bcaee43e80a7ea686d9efa2d08 (diff) | |
| download | illumos-joyent-ca8beeb64ffb099a0fa69ec946e7d1c284b1fc3f.tar.gz | |
[illumos-gate merge]
commit bc0e91320069f0bcaee43e80a7ea686d9efa2d08
5876 sys/regset.h pollutes name space (try 2)
commit 5878fad70d76d8711f6608c1f80b0447601261c6
4986 receiving replication stream fails if any snapshot exceeds refquota
Diffstat (limited to 'usr/src/lib/libc')
| -rw-r--r-- | usr/src/lib/libc/port/threads/sigaction.c | 2 | ||||
| -rw-r--r-- | usr/src/lib/libc/sparc/gen/makectxt.c | 4 | ||||
| -rw-r--r-- | usr/src/lib/libc/sparcv9/gen/makectxt.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/lib/libc/port/threads/sigaction.c b/usr/src/lib/libc/port/threads/sigaction.c index ada1afd523..6a283be33b 100644 --- a/usr/src/lib/libc/port/threads/sigaction.c +++ b/usr/src/lib/libc/port/threads/sigaction.c @@ -209,7 +209,7 @@ call_user_handler(int sig, siginfo_t *sip, ucontext_t *ucp) if (--fp->fpu_qcnt > 0) { unsigned char i; - struct fq *fqp; + struct _fq *fqp; fqp = fp->fpu_q; for (i = 0; i < fp->fpu_qcnt; i++) diff --git a/usr/src/lib/libc/sparc/gen/makectxt.c b/usr/src/lib/libc/sparc/gen/makectxt.c index 7519bdabcb..497c642516 100644 --- a/usr/src/lib/libc/sparc/gen/makectxt.c +++ b/usr/src/lib/libc/sparc/gen/makectxt.c @@ -27,15 +27,15 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #pragma weak _makecontext = makecontext #pragma weak ___makecontext_v2 = __makecontext_v2 #include "lint.h" #include <stdarg.h> #include <strings.h> +/* Can't just use <ucontext.h> due to redefine_extname stuff. */ #include <sys/ucontext.h> +#include <sys/regset.h> #include <sys/stack.h> #include <sys/frame.h> diff --git a/usr/src/lib/libc/sparcv9/gen/makectxt.c b/usr/src/lib/libc/sparcv9/gen/makectxt.c index 7519bdabcb..497c642516 100644 --- a/usr/src/lib/libc/sparcv9/gen/makectxt.c +++ b/usr/src/lib/libc/sparcv9/gen/makectxt.c @@ -27,15 +27,15 @@ /* Copyright (c) 1988 AT&T */ /* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" - #pragma weak _makecontext = makecontext #pragma weak ___makecontext_v2 = __makecontext_v2 #include "lint.h" #include <stdarg.h> #include <strings.h> +/* Can't just use <ucontext.h> due to redefine_extname stuff. */ #include <sys/ucontext.h> +#include <sys/regset.h> #include <sys/stack.h> #include <sys/frame.h> |