diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-02-17 01:22:52 -0500 |
|---|---|---|
| committer | Ulrich Drepper <drepper@gmail.com> | 2011-02-17 01:22:52 -0500 |
| commit | be6bd0b7ab68d0ed968138a41b5d18eb930d7443 (patch) | |
| tree | c79d676f8937f033b92b4a294255f309ce39cdb9 | |
| parent | d55fd7a5573ea7c7c14af95bc37618469cde8a5f (diff) | |
| parent | 8e31c82dbd7dad4d33b35d242b5a990f1168a859 (diff) | |
| download | glibc-be6bd0b7ab68d0ed968138a41b5d18eb930d7443.tar glibc-be6bd0b7ab68d0ed968138a41b5d18eb930d7443.tar.gz glibc-be6bd0b7ab68d0ed968138a41b5d18eb930d7443.tar.bz2 glibc-be6bd0b7ab68d0ed968138a41b5d18eb930d7443.zip | |
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
ChangeLog
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | stdio-common/psiginfo.c | 7 | ||||
| -rw-r--r-- | sysdeps/mach/i386/sysdep.h | 5 | ||||
| -rw-r--r-- | sysdeps/mach/i386/thread_state.h | 5 |
4 files changed, 27 insertions, 1 deletions
@@ -23,6 +23,17 @@ * configure.in: No need to check for ranlib. * elf/rtld-Rules: Don't use RANLIB. +2011-02-16 Samuel Thibault <samuel.thibault@ens-lyon.org> + + * sysdeps/mach/i386/sysdep.h: Add _MACH_I386_SYSDEP_H inclusion + protection macro. + * sysdeps/mach/i386/thread_state.h: Add _MACH_I386_THREAD_STATE_H + inclusion protection macro. + + * 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; diff --git a/sysdeps/mach/i386/sysdep.h b/sysdeps/mach/i386/sysdep.h index 4fc5d50f3d..fb77d4649c 100644 --- a/sysdeps/mach/i386/sysdep.h +++ b/sysdeps/mach/i386/sysdep.h @@ -18,6 +18,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifndef _MACH_I386_SYSDEP_H +#define _MACH_I386_SYSDEP_H 1 + /* Defines RTLD_PRIVATE_ERRNO and USE_DL_SYSINFO. */ #include <dl-sysdep.h> #include <tls.h> @@ -64,3 +67,5 @@ #undef ENTRY #undef ALIGN #include <sysdeps/unix/i386/sysdep.h> + +#endif /* mach/i386/sysdep.h */ diff --git a/sysdeps/mach/i386/thread_state.h b/sysdeps/mach/i386/thread_state.h index cefea2cfb6..e8fdef6e57 100644 --- a/sysdeps/mach/i386/thread_state.h +++ b/sysdeps/mach/i386/thread_state.h @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#ifndef _MACH_I386_THREAD_STATE_H +#define _MACH_I386_THREAD_STATE_H 1 + #include <mach/machine/thread_status.h> #define MACHINE_THREAD_STATE_FLAVOR i386_THREAD_STATE @@ -36,3 +39,5 @@ struct machine_thread_all_state }; #include <sysdeps/mach/thread_state.h> + +#endif /* mach/i386/thread_state.h */ |