aboutsummaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-02-17 01:22:52 -0500
committerUlrich Drepper <drepper@gmail.com>2011-02-17 01:22:52 -0500
commitbe6bd0b7ab68d0ed968138a41b5d18eb930d7443 (patch)
treec79d676f8937f033b92b4a294255f309ce39cdb9 /stdio-common
parentd55fd7a5573ea7c7c14af95bc37618469cde8a5f (diff)
parent8e31c82dbd7dad4d33b35d242b5a990f1168a859 (diff)
downloadglibc-be6bd0b7ab68d0ed968138a41b5d18eb930d7443.tar
glibc-be6bd0b7ab68d0ed968138a41b5d18eb930d7443.tar.gz
glibc-be6bd0b7ab68d0ed968138a41b5d18eb930d7443.tar.bz2
glibc-be6bd0b7ab68d0ed968138a41b5d18eb930d7443.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts: ChangeLog
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/psiginfo.c7
1 files changed, 6 insertions, 1 deletions
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;