From 97ea79864fc9d55fa3679597d4c2dbe8e518e06a Mon Sep 17 00:00:00 2001 From: Mikael Pettersson Date: Sun, 31 Jan 2016 15:14:09 +0100 Subject: hipe_x86_signal: cleanups - rename __SIGACTION to LIBC_SIGACTION, to avoid defining _-prefixed symbols --- erts/emulator/hipe/hipe_x86_signal.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'erts/emulator/hipe') 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 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 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); } -- cgit v1.2.3