diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2010-10-01 20:10:25 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2010-10-01 20:10:25 +0000 |
| commit | f6c0921c790c8e65ec6a905928e31fb4be9fd941 (patch) | |
| tree | da357754a8183796366a22b8c40c305783de9a69 /include/signal.h | |
| parent | 156590809a25ba5d258293fef25b0c81babff906 (diff) | |
Now that __only_inline is in <sys/cdefs.h>, replace the local versions in
<ctype.h> and <signal.h>
ok kettenis@ millert@ deraadt@
Diffstat (limited to 'include/signal.h')
| -rw-r--r-- | include/signal.h | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/include/signal.h b/include/signal.h index 6af20ad0f5d..7c6724d9fc4 100644 --- a/include/signal.h +++ b/include/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.13 2010/07/26 07:08:22 kettenis Exp $ */ +/* $OpenBSD: signal.h,v 1.14 2010/10/01 20:10:24 guenther Exp $ */ /* $NetBSD: signal.h,v 1.8 1996/02/29 00:04:57 jtc Exp $ */ /*- @@ -62,13 +62,9 @@ int sigpending(sigset_t *); int sigprocmask(int, const sigset_t *, sigset_t *); int sigsuspend(const sigset_t *); -#if defined(__GNUC__) -# if __GNUC_PREREQ__(4, 2) -#define __SIGNAL_INLINE extern __inline __attribute((__gnu_inline__)) -# else -#define __SIGNAL_INLINE extern __inline -# endif -__SIGNAL_INLINE int sigaddset(sigset_t *set, int signo) { +#if !defined(_ANSI_LIBRARY) && !defined(lint) + +__only_inline int sigaddset(sigset_t *set, int signo) { int *__errno(void); if (signo <= 0 || signo >= _NSIG) { @@ -79,7 +75,7 @@ __SIGNAL_INLINE int sigaddset(sigset_t *set, int signo) { return (0); } -__SIGNAL_INLINE int sigdelset(sigset_t *set, int signo) { +__only_inline int sigdelset(sigset_t *set, int signo) { int *__errno(void); if (signo <= 0 || signo >= _NSIG) { @@ -90,7 +86,7 @@ __SIGNAL_INLINE int sigdelset(sigset_t *set, int signo) { return (0); } -__SIGNAL_INLINE int sigismember(const sigset_t *set, int signo) { +__only_inline int sigismember(const sigset_t *set, int signo) { int *__errno(void); if (signo <= 0 || signo >= _NSIG) { @@ -99,7 +95,7 @@ __SIGNAL_INLINE int sigismember(const sigset_t *set, int signo) { } return ((*set & (1 << ((signo)-1))) != 0); } -#endif +#endif /* !_ANSI_LIBRARY && !lint */ /* List definitions after function declarations, or Reiser cpp gets upset. */ #define sigemptyset(set) (*(set) = 0, 0) |