aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2011-02-16 14:41:58 -0800
committerRoland McGrath <roland@redhat.com>2011-02-16 14:41:58 -0800
commitf75286c6968af12697f63ca60b2599478fd2c8f1 (patch)
tree19d15a3b68e48d1f38c786d0bd5371db53667308
parentc1d0e639a95d6d3d3f1c1f70cf97d596bd5a24ec (diff)
downloadglibc-f75286c6968af12697f63ca60b2599478fd2c8f1.tar
glibc-f75286c6968af12697f63ca60b2599478fd2c8f1.tar.gz
glibc-f75286c6968af12697f63ca60b2599478fd2c8f1.tar.bz2
glibc-f75286c6968af12697f63ca60b2599478fd2c8f1.zip
Conditionalize use of SIGRTMIN in psiginfo.
-rw-r--r--ChangeLog6
-rw-r--r--stdio-common/psiginfo.c7
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 550f22a36f..3d890b8e05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-16 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * stdio-common/psiginfo.c (psiginfo): Check pinfo->si_signo against
+ SIGRTMIN and SIGRTMAX and print information in that case only when
+ SIGRTMIN is defined.
+
2011-02-11 Jakub Jelinek <jakub@redhat.com>
* stdio-common/printf-parsemb.c (__parse_one_specmb): Handle
diff --git a/stdio-common/psiginfo.c b/stdio-common/psiginfo.c
index 627c21c640..a10780d05b 100644
--- a/stdio-common/psiginfo.c
+++ b/stdio-common/psiginfo.c
@@ -86,8 +86,12 @@ psiginfo (const siginfo_t *pinfo, const char *s)
const char *desc;
if (pinfo->si_signo >= 0 && pinfo->si_signo < NSIG
&& ((desc = INTUSE(_sys_siglist)[pinfo->si_signo]) != NULL
- || (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)))
+#ifdef SIGRTMIN
+ || (pinfo->si_signo >= SIGRTMIN && pinfo->si_signo < SIGRTMAX)
+#endif
+ ))
{
+#ifdef SIGRTMIN
if (desc == NULL)
{
if (pinfo->si_signo - SIGRTMIN < SIGRTMAX - pinfo->si_signo)
@@ -106,6 +110,7 @@ psiginfo (const siginfo_t *pinfo, const char *s)
}
}
else
+#endif
fprintf (fp, "%s (", _(desc));
const char *base = NULL;