aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Pettersson <[email protected]>2016-01-31 15:15:40 +0100
committerMikael Pettersson <[email protected]>2016-01-31 15:50:00 +0100
commit2d86df7cf1c5645fa80ef091b1f9a39ce44f764d (patch)
treee24a5deb37dccf537c8bb697ccf8d4147d7d2345
parent202c3dac37587e468b4c968a392c0b97668dda7e (diff)
downloadotp-2d86df7cf1c5645fa80ef091b1f9a39ce44f764d.tar.gz
otp-2d86df7cf1c5645fa80ef091b1f9a39ce44f764d.tar.bz2
otp-2d86df7cf1c5645fa80ef091b1f9a39ce44f764d.zip
hipe_x86_signal: cleanups
- move extern declarations of LIBC_SIGACTION() from system-specific blocks to the common LIBC_SIGACTION block
-rw-r--r--erts/emulator/hipe/hipe_x86_signal.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/erts/emulator/hipe/hipe_x86_signal.c b/erts/emulator/hipe/hipe_x86_signal.c
index 2e7e64eae3..b44899401b 100644
--- a/erts/emulator/hipe/hipe_x86_signal.c
+++ b/erts/emulator/hipe/hipe_x86_signal.c
@@ -81,7 +81,6 @@
#define __USE_GNU /* to un-hide RTLD_NEXT */
#endif
#define NEXT_SIGACTION "__sigaction"
-extern int __sigaction(int, const struct sigaction*, struct sigaction*);
#define LIBC_SIGACTION __sigaction
#endif /* glibc >= 2.3 */
@@ -107,7 +106,6 @@ extern int __sigaction(int, const struct sigaction*, struct sigaction*);
* of and don't modify.
*/
#define NEXT_SIGACTION "sigaction"
-extern int _sigaction(int, const struct sigaction*, struct sigaction*);
#define LIBC_SIGACTION _sigaction
#define _NSIG NSIG
#endif /* __DARWIN__ */
@@ -143,7 +141,6 @@ extern int _sigaction(int, const struct sigaction*, struct sigaction*);
* CAVEAT: detailed semantics are not verified yet.
*/
#define NEXT_SIGACTION "sigaction"
-extern int _sigaction(int, const struct sigaction*, struct sigaction*);
#define LIBC_SIGACTION _sigaction
#define _NSIG NSIG
#endif /* __FreeBSD__ */
@@ -218,11 +215,12 @@ static int my_sigaction(int signum, const struct sigaction *act, struct sigactio
}
#endif
+#if defined(LIBC_SIGACTION)
/*
* This overrides the C library's core sigaction() procedure, catching
* all its internal calls.
*/
-#if defined(LIBC_SIGACTION)
+extern int LIBC_SIGACTION(int, const struct sigaction*, struct sigaction*);
int LIBC_SIGACTION(int signum, const struct sigaction *act, struct sigaction *oldact)
{
return my_sigaction(signum, act, oldact);