diff options
Diffstat (limited to 'lib/libc')
| -rw-r--r-- | lib/libc/Symbols.list | 2 | ||||
| -rw-r--r-- | lib/libc/gen/siginterrupt.c | 3 | ||||
| -rw-r--r-- | lib/libc/gen/signal.c | 8 | ||||
| -rw-r--r-- | lib/libc/hidden/signal.h | 8 | ||||
| -rw-r--r-- | lib/libc/hidden/string.h | 7 |
5 files changed, 15 insertions, 13 deletions
diff --git a/lib/libc/Symbols.list b/lib/libc/Symbols.list index 9183ae0993a..3b215f91528 100644 --- a/lib/libc/Symbols.list +++ b/lib/libc/Symbols.list @@ -511,7 +511,6 @@ __isnormal __isnormalf __isnormall __nan -__sigintr __signbit __signbitf __signbitl @@ -1537,7 +1536,6 @@ unsetenv /* string */ __explicit_bzero_hook -__strsignal bcmp bcopy bzero diff --git a/lib/libc/gen/siginterrupt.c b/lib/libc/gen/siginterrupt.c index ac74a7ab6bf..ed23687b697 100644 --- a/lib/libc/gen/siginterrupt.c +++ b/lib/libc/gen/siginterrupt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siginterrupt.c,v 1.6 2005/08/08 08:05:34 espie Exp $ */ +/* $OpenBSD: siginterrupt.c,v 1.7 2015/09/09 16:10:03 guenther Exp $ */ /* * Copyright (c) 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -37,7 +37,6 @@ int siginterrupt(int sig, int flag) { - extern sigset_t __sigintr; struct sigaction sa; int ret; diff --git a/lib/libc/gen/signal.c b/lib/libc/gen/signal.c index efce8093d0e..03a6fa3d5a2 100644 --- a/lib/libc/gen/signal.c +++ b/lib/libc/gen/signal.c @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.c,v 1.7 2005/08/08 08:05:34 espie Exp $ */ +/* $OpenBSD: signal.c,v 1.8 2015/09/09 16:10:03 guenther Exp $ */ /* * Copyright (c) 1985, 1989, 1993 * The Regents of the University of California. All rights reserved. @@ -37,7 +37,7 @@ sigset_t __sigintr; /* shared with siginterrupt */ sig_t -_signal(int s, sig_t a) +signal(int s, sig_t a) { struct sigaction sa, osa; @@ -51,6 +51,6 @@ _signal(int s, sig_t a) return (SIG_ERR); return (osa.sa_handler); } +DEF_STRONG(signal); -__weak_alias(signal, _signal); -__weak_alias(bsd_signal, _signal); +__weak_alias(bsd_signal, signal); diff --git a/lib/libc/hidden/signal.h b/lib/libc/hidden/signal.h index f3535fcabea..8cbda91b72d 100644 --- a/lib/libc/hidden/signal.h +++ b/lib/libc/hidden/signal.h @@ -1,4 +1,4 @@ -/* $OpenBSD: signal.h,v 1.1 2015/09/06 20:26:20 guenther Exp $ */ +/* $OpenBSD: signal.h,v 1.2 2015/09/09 16:10:03 guenther Exp $ */ /* * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org> * @@ -21,7 +21,13 @@ #include_next <signal.h> #include "namespace.h" +__BEGIN_HIDDEN_DECLS +extern sigset_t __sigintr; +__END_HIDDEN_DECLS + extern PROTO_NORMAL(sys_siglist); extern PROTO_NORMAL(sys_signame); +PROTO_NORMAL(signal); + #endif /* !_LIBC_SIGNAL_H */ diff --git a/lib/libc/hidden/string.h b/lib/libc/hidden/string.h index dc4e4801e02..48278f30176 100644 --- a/lib/libc/hidden/string.h +++ b/lib/libc/hidden/string.h @@ -1,4 +1,4 @@ -/* $OpenBSD: string.h,v 1.1 2015/08/31 02:53:56 guenther Exp $ */ +/* $OpenBSD: string.h,v 1.2 2015/09/09 16:10:03 guenther Exp $ */ /* * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org> * @@ -21,10 +21,9 @@ #include_next <string.h> #include "namespace.h" -/* XXX should make this __BEGIN_HIDDEN_DECLS */ -__BEGIN_DECLS +__BEGIN_HIDDEN_DECLS char *__strsignal(int , char *); -__END_DECLS +__END_HIDDEN_DECLS PROTO_NORMAL(bcmp); PROTO_NORMAL(bcopy); |