aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Pettersson <[email protected]>2016-01-31 15:14:09 +0100
committerMikael Pettersson <[email protected]>2016-01-31 15:49:53 +0100
commit97ea79864fc9d55fa3679597d4c2dbe8e518e06a (patch)
tree9577f139c574feff9571c7446bda8a48fd403594
parent050480b2326ea3583231a0de02fb087bf51db82a (diff)
downloadotp-97ea79864fc9d55fa3679597d4c2dbe8e518e06a.tar.gz
otp-97ea79864fc9d55fa3679597d4c2dbe8e518e06a.tar.bz2
otp-97ea79864fc9d55fa3679597d4c2dbe8e518e06a.zip
hipe_x86_signal: cleanups
- rename __SIGACTION to LIBC_SIGACTION, to avoid defining _-prefixed symbols
-rw-r--r--erts/emulator/hipe/hipe_x86_signal.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/erts/emulator/hipe/hipe_x86_signal.c b/erts/emulator/hipe/hipe_x86_signal.c
index 741f570c50..6bb442490e 100644
--- a/erts/emulator/hipe/hipe_x86_signal.c
+++ b/erts/emulator/hipe/hipe_x86_signal.c
@@ -84,7 +84,7 @@
static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
#define init_done() (__next_sigaction != 0)
extern int __sigaction(int, const struct sigaction*, struct sigaction*);
-#define __SIGACTION __sigaction
+#define LIBC_SIGACTION __sigaction
static void do_init(void)
{
__next_sigaction = dlsym(RTLD_NEXT, "__sigaction");
@@ -121,7 +121,7 @@ static void do_init(void)
static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
#define init_done() (__next_sigaction != 0)
extern int _sigaction(int, const struct sigaction*, struct sigaction*);
-#define __SIGACTION _sigaction
+#define LIBC_SIGACTION _sigaction
static void do_init(void)
{
__next_sigaction = dlsym(RTLD_NEXT, "sigaction");
@@ -157,7 +157,7 @@ static void do_init(void)
#include <dlfcn.h>
static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
#define init_done() (__next_sigaction != 0)
-#define __SIGACTION _sigaction
+#define LIBC_SIGACTION _sigaction
static void do_init(void)
{
__next_sigaction = dlsym(RTLD_NEXT, "_sigaction");
@@ -179,7 +179,7 @@ static void do_init(void)
static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
#define init_done() (__next_sigaction != 0)
extern int _sigaction(int, const struct sigaction*, struct sigaction*);
-#define __SIGACTION _sigaction
+#define LIBC_SIGACTION _sigaction
static void do_init(void)
{
__next_sigaction = dlsym(RTLD_NEXT, "sigaction");
@@ -213,7 +213,7 @@ static void do_init(void)
#include <dlfcn.h>
static int (*__next_sigaction)(int, const struct sigaction*, struct sigaction*);
#define init_done() (__next_sigaction != 0)
-#define __SIGACTION __libc_sigaction
+#define LIBC_SIGACTION __libc_sigaction
static void do_init(void)
{
__next_sigaction = dlsym(RTLD_NEXT, "__libc_sigaction");
@@ -257,8 +257,8 @@ static int my_sigaction(int signum, const struct sigaction *act, struct sigactio
* This overrides the C library's core sigaction() procedure, catching
* all its internal calls.
*/
-#ifdef __SIGACTION
-int __SIGACTION(int signum, const struct sigaction *act, struct sigaction *oldact)
+#if defined(LIBC_SIGACTION)
+int LIBC_SIGACTION(int signum, const struct sigaction *act, struct sigaction *oldact)
{
return my_sigaction(signum, act, oldact);
}