diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2005-12-18 15:42:54 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2005-12-18 15:42:54 +0000 |
| commit | c0aa54c9b441f7548fa6ba79a87594b2168fd120 (patch) | |
| tree | ce4f0244876984a28ae20dcac381e003f4fe12e7 /sys/arch/arm/include | |
| parent | b82cd7c01a322762d9e140071e45089d72905e97 (diff) | |
Don't include cdefs.h if _LOCORE is defined and hide some more defines
unless __BSD_VISIBLE or _LOCORE are set. OK deraadt@
Diffstat (limited to 'sys/arch/arm/include')
| -rw-r--r-- | sys/arch/arm/include/signal.h | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/sys/arch/arm/include/signal.h b/sys/arch/arm/include/signal.h index 121b03d4120..33f907ad336 100644 --- a/sys/arch/arm/include/signal.h +++ b/sys/arch/arm/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.2 2005/12/14 21:46:30 millert Exp $ */ +/* $OpenBSD: signal.h,v 1.3 2005/12/18 15:42:52 millert Exp $ */ /* $NetBSD: signal.h,v 1.5 2003/10/18 17:57:21 briggs Exp $ */ /* @@ -47,16 +47,12 @@ #ifndef _ARM32_SIGNAL_H_ #define _ARM32_SIGNAL_H_ +#ifndef _LOCORE #include <sys/cdefs.h> -#ifndef _LOCORE typedef int sig_atomic_t; -#endif - -#define __HAVE_SIGINFO #if __BSD_VISIBLE -#ifndef _LOCORE /* * Information pushed on stack when a signal is delivered. * This is used by the kernel to restore state following @@ -64,7 +60,6 @@ typedef int sig_atomic_t; * to the handler to allow it to restore state properly if * a non-standard exit is performed. */ - struct sigcontext { int sc_onstack; /* sigstack state to restore */ int sc_mask; /* signal mask to restore (old style) */ @@ -92,17 +87,16 @@ struct sigcontext { sigset_t sc_mask; /* signal mask to restore (new style) */ #endif }; - +#endif /* __BSD_VISIBLE */ #endif /* !_LOCORE */ -/* Signals codes */ +#if defined(_LOCORE) || __BSD_VISIBLE /* * SIGFPE codes * * see ieeefp.h for definition of FP exception codes */ - #define SIG_CODE_FPE_CODE_MASK 0x00000f00 /* Mask for exception code */ #define SIG_CODE_FPE_CODE_SHIFT 8 /* Shift for exception code */ #define SIG_CODE_FPE_TYPE_MASK 0x000000ff /* Mask for specific code */ @@ -125,11 +119,10 @@ struct sigcontext { * should be treated as undefined (in practice it is the bottom 4 bits * of the fault address). */ - #define SIG_CODE_BUS_ADDR_MASK 0xfffffff0 #define SIG_CODE_BUS_TYPE_MASK 0x0000000f #define SIG_CODE_SEGV_ADDR_MASK SIG_CODE_BUS_ADDR_MASK #define SIG_CODE_SEGV_TYPE_MASK SIG_CODE_BUS_TYPE_MASK -#endif /* __BSD_VISIBLE */ +#endif /* _LOCORE || __BSD_VISIBLE */ #endif /* !_ARM32_SIGNAL_H_ */ |