diff options
| author | Christoph Muellner <cmuellner@gcc.gnu.org> | 2021-08-02 17:00:58 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2021-08-02 17:42:03 +0300 |
| commit | 15c53a34bc944346fde129700a020647095b1b7d (patch) | |
| tree | 4a6dedc3d2cab1c0c24895f329e7500420993c33 /newlib/libc/signal | |
| parent | 5970bbded8bfd417861c78cc077444764aa2fe93 (diff) | |
libc: Fix compilation for new sig2str/str2sig implementation
A recent patch introduced new code for sig2str/str2sig.
This code does not properly exclude code that requires
SIGRTMIN/SIGRTMAX to be defined and triggers the following
compile error:
newlib/libc/signal/sig2str.c:199:8: error: 'SIGRTMIN' undeclared
newlib/libc/signal/sig2str.c:200:29: error: 'SIGRTMAX' undeclared
Let's add the missing guards.
Fixes: 2b50ec0cd205 ("libc: Fix compilation for new sig2str/str2sig implementation")
Signed-off-by: Christoph Muellner <cmuellner@gcc.gnu.org>
Diffstat (limited to 'newlib/libc/signal')
| -rw-r--r-- | newlib/libc/signal/sig2str.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/newlib/libc/signal/sig2str.c b/newlib/libc/signal/sig2str.c index 940a5eab9..d3be1ba68 100644 --- a/newlib/libc/signal/sig2str.c +++ b/newlib/libc/signal/sig2str.c @@ -194,6 +194,7 @@ sig2str(int signum, char *str) { const sig_name_and_num *sptr; +#if defined (SIGRTMIN) && defined (SIGRTMAX) /* If signum falls in lower half of the real time signals range, define * the saved str value as "RTMIN+n" according to the Issue 8 standard */ if ((SIGRTMIN + 1) <= signum && @@ -209,6 +210,7 @@ sig2str(int signum, char *str) sprintf(str, "RTMAX-%d", (SIGRTMAX - signum)); return 0; } +#endif /* Otherwise, search for signal matching signum in sig_array. If found, * save its string value in str. */ @@ -231,6 +233,7 @@ str2sig(const char *restrict str, int *restrict pnum) const sig_name_and_num *sptr; unsigned long is_valid_decimal; +#if defined (SIGRTMIN) && defined (SIGRTMAX) /* i686 Cygwin only supports one RT signal. For this case, skip checks * for "RTMIN+n" and "RTMAX-m". */ if (SIGRTMIN != SIGRTMAX) { @@ -269,6 +272,7 @@ str2sig(const char *restrict str, int *restrict pnum) return -1; } } +#endif /*If str is a valid signal name, save its corresponding number in pnum. */ for (sptr = sig_array; sptr < &sig_array[NUM_OF_SIGS]; sptr++) { @@ -289,9 +293,10 @@ str2sig(const char *restrict str, int *restrict pnum) /* If str is a representation of a decimal value, save its integer value * in pnum. */ if (1 <= is_valid_decimal && - is_valid_decimal <= SIGRTMAX) { + is_valid_decimal <= (NSIG - 1)) { *pnum = is_valid_decimal; return 0; } + return -1; } |