Skip to content

Commit 3f04331

Browse files
committed
Remove useless #ifdef's from fpm_signals.c
1 parent 987fdf4 commit 3f04331

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

sapi/fpm/fpm/fpm_signals.c

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,42 +23,34 @@ static sigset_t block_sigset;
2323
static sigset_t child_block_sigset;
2424

2525
const char *fpm_signal_names[NSIG + 1] = {
26+
/* The C standard guarantees at least these 6 signal numbers will be defined in signal.c: */
27+
[SIGABRT] = "SIGABRT",
28+
[SIGFPE] = "SIGFPE",
29+
[SIGILL] = "SIGILL",
30+
[SIGINT] = "SIGINT",
31+
[SIGSEGV] = "SIGSEGV",
32+
[SIGTERM] = "SIGTERM",
2633
#ifdef SIGHUP
2734
[SIGHUP] = "SIGHUP",
2835
#endif
29-
#ifdef SIGINT
30-
[SIGINT] = "SIGINT",
31-
#endif
3236
#ifdef SIGQUIT
3337
[SIGQUIT] = "SIGQUIT",
3438
#endif
35-
#ifdef SIGILL
36-
[SIGILL] = "SIGILL",
37-
#endif
3839
#ifdef SIGTRAP
3940
[SIGTRAP] = "SIGTRAP",
4041
#endif
41-
#ifdef SIGABRT
42-
[SIGABRT] = "SIGABRT",
43-
#endif
4442
#ifdef SIGEMT
4543
[SIGEMT] = "SIGEMT",
4644
#endif
4745
#ifdef SIGBUS
4846
[SIGBUS] = "SIGBUS",
4947
#endif
50-
#ifdef SIGFPE
51-
[SIGFPE] = "SIGFPE",
52-
#endif
5348
#ifdef SIGKILL
5449
[SIGKILL] = "SIGKILL",
5550
#endif
5651
#ifdef SIGUSR1
5752
[SIGUSR1] = "SIGUSR1",
5853
#endif
59-
#ifdef SIGSEGV
60-
[SIGSEGV] = "SIGSEGV",
61-
#endif
6254
#ifdef SIGUSR2
6355
[SIGUSR2] = "SIGUSR2",
6456
#endif
@@ -68,9 +60,6 @@ const char *fpm_signal_names[NSIG + 1] = {
6860
#ifdef SIGALRM
6961
[SIGALRM] = "SIGALRM",
7062
#endif
71-
#ifdef SIGTERM
72-
[SIGTERM] = "SIGTERM",
73-
#endif
7463
#ifdef SIGCHLD
7564
[SIGCHLD] = "SIGCHLD",
7665
#endif

0 commit comments

Comments
 (0)