diff options
Diffstat (limited to 'src/signal')
-rw-r--r-- | src/signal/__signal_h.c (renamed from src/signal/__signal.c) | 2 | ||||
-rw-r--r-- | src/signal/__signal_handler.c | 10 | ||||
-rw-r--r-- | src/signal/_signal.h | 2 | ||||
-rw-r--r-- | src/signal/signal.c | 6 |
4 files changed, 10 insertions, 10 deletions
diff --git a/src/signal/__signal.c b/src/signal/__signal_h.c index d4a819c6..fde51b63 100644 --- a/src/signal/__signal.c +++ b/src/signal/__signal_h.c @@ -1,6 +1,6 @@ #include "_signal.h" -struct __signal ___signal = {0}; +struct __signal __signal_h = { 0 }; /* STDC(0) diff --git a/src/signal/__signal_handler.c b/src/signal/__signal_handler.c index c7a4675c..2e8afd1e 100644 --- a/src/signal/__signal_handler.c +++ b/src/signal/__signal_handler.c @@ -9,18 +9,18 @@ void __signal_handler(int sig) UNDEFINED("signal %d occured during quick_exit", sig); } - ___signal.current = sig; - if (___signal.handlers[sig] != NULL) { - ___signal.handlers[sig](sig); + __signal_h.current = sig; + if (__signal_h.handlers[sig] != NULL) { + __signal_h.handlers[sig](sig); } /* TODO: signal number to name */ if (sig == SIGFPE || sig == SIGILL || sig == SIGSEGV) { - ___signal.current = 0; + __signal_h.current = 0; UNDEFINED("Signal handler for signal %d returned", sig); } - ___signal.current = 0; + __signal_h.current = 0; } /* diff --git a/src/signal/_signal.h b/src/signal/_signal.h index 40a01fa0..f450c053 100644 --- a/src/signal/_signal.h +++ b/src/signal/_signal.h @@ -10,7 +10,7 @@ typedef void (*handler)(int); extern struct __signal { int current; handler handlers[NSIGNALS]; -} ___signal; +} __signal_h; void __signal_handler(int); diff --git a/src/signal/signal.c b/src/signal/signal.c index 6a48b49a..85a82172 100644 --- a/src/signal/signal.c +++ b/src/signal/signal.c @@ -27,7 +27,7 @@ GCC_SSE_HACK void (*signal(int sig, void (*func)(int)))(int) { /* signal safe iff we are resetting the current signal handler */ - SIGNAL_SAFE((___signal.current == sig)); + SIGNAL_SAFE((__signal_h.current == sig)); if (sig < 0 || sig > NSIGNALS) { /* FIXME: should errno be set? */ @@ -38,8 +38,8 @@ void (*signal(int sig, void (*func)(int)))(int) UNDEFINED("signal handler is not executable"); } - void (*prev)(int) = ___signal.handlers[sig]; - ___signal.handlers[sig] = func; + void (*prev)(int) = __signal_h.handlers[sig]; + __signal_h.handlers[sig] = func; struct sigaction act = { 0 }; act.sa_handler = __signal_handler; |