diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2005-12-13 00:35:25 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2005-12-13 00:35:25 +0000 |
| commit | b37c889bf62a36bfc3a70a30cb8c6e2e9b253d51 (patch) | |
| tree | 12a945cbf5263926f1c35d9dab17e5ca17d14869 /include/signal.h | |
| parent | 4623e5435a9e80c267c1b601a543e14f95b883da (diff) | |
First step in include files overhaul. Use __FOO_VISIBLE (as defined
in sys/cdefs.h) instead of _FOO_SOURCE. Also fix several namespace
pollution issues, including the byte order defines. OK deraadt@
Diffstat (limited to 'include/signal.h')
| -rw-r--r-- | include/signal.h | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/include/signal.h b/include/signal.h index fd50069fda9..807afb501e2 100644 --- a/include/signal.h +++ b/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.8 2004/05/03 17:25:00 millert Exp $ */ +/* $OpenBSD: signal.h,v 1.9 2005/12/13 00:35:22 millert Exp $ */ /* $NetBSD: signal.h,v 1.8 1996/02/29 00:04:57 jtc Exp $ */ /*- @@ -35,20 +35,21 @@ #ifndef _USER_SIGNAL_H #define _USER_SIGNAL_H +#include <sys/cdefs.h> #include <sys/signal.h> -#if !defined(_ANSI_SOURCE) +#if __BSD_VISIBLE || __POSIX_VISIBLE || __XPG_VISIBLE #include <sys/types.h> #endif -#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE) +#if __BSD_VISIBLE extern __const char *__const sys_signame[_NSIG]; extern __const char *__const sys_siglist[_NSIG]; #endif __BEGIN_DECLS int raise(int); -#ifndef _ANSI_SOURCE +#if __BSD_VISIBLE || __POSIX_VISIBLE || __XPG_VISIBLE void (*bsd_signal(int, void (*)(int)))(int); int kill(pid_t, int); int sigaction(int, const struct sigaction *, struct sigaction *); @@ -99,20 +100,24 @@ extern __inline int sigismember(const sigset_t *set, int signo) { #define sigemptyset(set) (*(set) = 0, 0) #define sigfillset(set) (*(set) = ~(sigset_t)0, 0) -#ifndef _POSIX_SOURCE +#if __BSD_VISIBLE || __XPG_VISIBLE >= 420 int killpg(pid_t, int); -int sigblock(int); int siginterrupt(int, int); int sigpause(int); int sigreturn(struct sigcontext *); -int sigsetmask(int); int sigstack(const struct sigstack *, struct sigstack *); int sigaltstack(const struct sigaltstack *, struct sigaltstack *); -int sigvec(int, struct sigvec *, struct sigvec *); +#if __BSD_VISIBLE void psignal(unsigned int, const char *); +int sigblock(int); +int sigsetmask(int); +int sigvec(int, struct sigvec *, struct sigvec *); +#endif +#if __BSD_VISIBLE || __POSIX_VISIBLE >= 199309 || __XPG_VISIBLE >= 500 int sigwait(const sigset_t *, int *); -#endif /* !_POSIX_SOURCE */ -#endif /* !_ANSI_SOURCE */ +#endif +#endif /* __BSD_VISIBLE || __XPG_VISIBLE >= 420 */ +#endif /* __BSD_VISIBLE || __POSIX_VISIBLE || __XPG_VISIBLE */ __END_DECLS #endif /* !_USER_SIGNAL_H */ |