summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2016-09-26 05:57:58 +0000
committerguenther <guenther@openbsd.org>2016-09-26 05:57:58 +0000
commit4bb51dcdc5cbe7d1ff77bb6519ee277c1efa803c (patch)
treea691db8488df3e52fbcef006c2234c855f160c4a
parentno overstrikes in -i mode; ok millert@ guenther@ (diff)
downloadwireguard-openbsd-4bb51dcdc5cbe7d1ff77bb6519ee277c1efa803c.tar.xz
wireguard-openbsd-4bb51dcdc5cbe7d1ff77bb6519ee277c1efa803c.zip
sigsetmask() and sigblock() are no longer used by any setjmp implementation
so the internal hidden names are unused; switch to PROTO_DEPRECATED() and drop the DEF_WEAK()s
-rw-r--r--lib/libc/compat-43/sigcompat.c2
-rw-r--r--lib/libc/hidden/signal.h6
2 files changed, 3 insertions, 5 deletions
diff --git a/lib/libc/compat-43/sigcompat.c b/lib/libc/compat-43/sigcompat.c
index c4f2407d22b..e6df01f8eda 100644
--- a/lib/libc/compat-43/sigcompat.c
+++ b/lib/libc/compat-43/sigcompat.c
@@ -57,7 +57,6 @@ sigsetmask(int mask)
return (n);
return (omask);
}
-DEF_WEAK(sigsetmask);
int
sigblock(int mask)
@@ -70,7 +69,6 @@ sigblock(int mask)
return (n);
return (omask);
}
-DEF_WEAK(sigblock);
int
sigpause(int mask)
diff --git a/lib/libc/hidden/signal.h b/lib/libc/hidden/signal.h
index a7677134c48..764a32f4fdc 100644
--- a/lib/libc/hidden/signal.h
+++ b/lib/libc/hidden/signal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: signal.h,v 1.13 2016/09/06 19:56:36 guenther Exp $ */
+/* $OpenBSD: signal.h,v 1.14 2016/09/26 05:57:58 guenther Exp $ */
/*
* Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
*
@@ -57,13 +57,13 @@ PROTO_DEPRECATED(pthread_sigmask);
PROTO_NORMAL(raise);
PROTO_WRAP(sigaction);
PROTO_NORMAL(sigaltstack);
-PROTO_NORMAL(sigblock);
+PROTO_DEPRECATED(sigblock);
PROTO_DEPRECATED(siginterrupt);
PROTO_STD_DEPRECATED(signal);
PROTO_DEPRECATED(sigpause);
PROTO_NORMAL(sigpending);
PROTO_WRAP(sigprocmask);
-PROTO_NORMAL(sigsetmask);
+PROTO_DEPRECATED(sigsetmask);
PROTO_CANCEL(sigsuspend);
PROTO_DEPRECATED(sigvec);
PROTO_NORMAL(thrkill);