From f75286c6968af12697f63ca60b2599478fd2c8f1 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed, 16 Feb 2011 14:41:58 -0800
Subject: Conditionalize use of SIGRTMIN in psiginfo.

---
 ChangeLog               | 6 ++++++
 stdio-common/psiginfo.c | 7 ++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

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;
-- 
cgit 1.4.1


From 8e31c82dbd7dad4d33b35d242b5a990f1168a859 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date: Wed, 16 Feb 2011 15:16:33 -0800
Subject: Add multiple inclusion protection to some Mach/i386 internal headers.

---
 ChangeLog                        | 5 +++++
 sysdeps/mach/i386/sysdep.h       | 5 +++++
 sysdeps/mach/i386/thread_state.h | 5 +++++
 3 files changed, 15 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 3d890b8e05..425ededbb9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 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.
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 */
-- 
cgit 1.4.1