diff options
| author | kib <kib@FreeBSD.org> | 2016-02-12 07:38:19 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-02-12 07:38:19 +0000 |
| commit | a05a278552bfbdc67dd026be8a748c627b57d0c4 (patch) | |
| tree | 783f901008bac7a377fe9c52843c1f80c9e84512 /sys/mips | |
| parent | 7af72453b7efe688c01e9d79607f455c01914ba7 (diff) | |
| download | FreeBSD-src-a05a278552bfbdc67dd026be8a748c627b57d0c4.zip FreeBSD-src-a05a278552bfbdc67dd026be8a748c627b57d0c4.tar.gz | |
POSIX states that #include <signal.h> shall make both mcontext_t and
ucontext_t available. Our code even has XXX comment about this.
Add a bit of compliance by moving struct __ucontext definition into
sys/_ucontext.h and including it into signal.h and sys/ucontext.h.
Several machine/ucontext.h headers were changed to use namespace-safe
types (like uint64_t->__uint64_t) to not depend on sys/types.h.
struct __stack_t from sys/signal.h is made always visible in private
namespace to satisfy sys/_ucontext.h requirements.
Apparently mips _types.h pollutes global namespace with f_register_t
type definition. This commit does not try to fix the issue.
PR: 207079
Reported and tested by: Ting-Wei Lan <lantw44@gmail.com>
Sponsored by: The FreeBSD Foundation
MFC after: 2 weeks
Diffstat (limited to 'sys/mips')
| -rw-r--r-- | sys/mips/include/ucontext.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/mips/include/ucontext.h b/sys/mips/include/ucontext.h index a37fe7e..2b1a952 100644 --- a/sys/mips/include/ucontext.h +++ b/sys/mips/include/ucontext.h @@ -50,13 +50,13 @@ typedef struct __mcontext { * struct sigcontext and ucontext_t at the same time. */ int mc_onstack; /* sigstack state to restore */ - register_t mc_pc; /* pc at time of signal */ - register_t mc_regs[32]; /* processor regs 0 to 31 */ - register_t sr; /* status register */ - register_t mullo, mulhi; /* mullo and mulhi registers... */ + __register_t mc_pc; /* pc at time of signal */ + __register_t mc_regs[32]; /* processor regs 0 to 31 */ + __register_t sr; /* status register */ + __register_t mullo, mulhi; /* mullo and mulhi registers... */ int mc_fpused; /* fp has been used */ f_register_t mc_fpregs[33]; /* fp regs 0 to 31 and csr */ - register_t mc_fpc_eir; /* fp exception instruction reg */ + __register_t mc_fpc_eir; /* fp exception instruction reg */ void *mc_tls; /* pointer to TLS area */ int __spare__[8]; /* XXX reserved */ } mcontext_t; |
