From ca439e9a54f07bc2010162f27900c2be9f082217 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 2 Jan 2002 09:52:27 +0000 Subject: [PATCH] 2002-01-02 Roland McGrath * sysdeps/mach/hurd/i386/bits/sigcontext.h: Protect from multiple inclusion. Inhibit #error under [_SYS_UCONTEXT_H]. * sysdeps/mach/hurd/alpha/bits/sigcontext.h: Likewise. * sysdeps/mach/hurd/hppa/bits/sigcontext.h: Likewise. * sysdeps/mach/hurd/mips/bits/sigcontext.h: Likewise. * sysdeps/mach/hurd/powerpc/bits/sigcontext.h: Likewise. --- sysdeps/mach/hurd/alpha/bits/sigcontext.h | 8 ++++++-- sysdeps/mach/hurd/hppa/bits/sigcontext.h | 8 ++++++-- sysdeps/mach/hurd/mips/bits/sigcontext.h | 9 +++++++-- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/sysdeps/mach/hurd/alpha/bits/sigcontext.h b/sysdeps/mach/hurd/alpha/bits/sigcontext.h index 158db61876..4f13a2c9b2 100644 --- a/sysdeps/mach/hurd/alpha/bits/sigcontext.h +++ b/sysdeps/mach/hurd/alpha/bits/sigcontext.h @@ -1,5 +1,5 @@ /* Machine-dependent signal context structure for GNU Hurd. Alpha version. - Copyright (C) 1994, 1997 Free Software Foundation, Inc. + Copyright (C) 1994,97,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,10 +17,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifndef _SIGNAL_H +#if !defined _SIGNAL_H && !defined _SYS_UCONTEXT_H # error "Never use directly; include instead." #endif +#ifndef sc_alpha_thread_state + /* Signal handlers are actually called: void handler (int sig, int code, struct sigcontext *scp); */ @@ -67,3 +69,5 @@ struct sigcontext double sc_fpregs[31]; /* Floating point registers $f0..$f30. */ long int sc_fpcsr; /* Floating point control/status register. */ }; + +#endif /* sc_alpha_thread_state */ diff --git a/sysdeps/mach/hurd/hppa/bits/sigcontext.h b/sysdeps/mach/hurd/hppa/bits/sigcontext.h index 0042359562..5db43fc22c 100644 --- a/sysdeps/mach/hurd/hppa/bits/sigcontext.h +++ b/sysdeps/mach/hurd/hppa/bits/sigcontext.h @@ -1,5 +1,5 @@ /* Machine-dependent signal context structure for GNU Hurd. HPPA version. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1995,97,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -17,10 +17,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifndef _SIGNAL_H +#if !defined _SIGNAL_H && !defined _SYS_UCONTEXT_H # error "Never use directly; include instead." #endif +#ifndef sc_parisc_thread_state + /* Signal handlers are actually called: void handler (int sig, int code, struct sigcontext *scp); */ @@ -88,3 +90,5 @@ struct sigcontext /* Floating point registers $f0..$f31. */ double sc_fpregs[32]; }; + +#endif /* sc_parisc_thread_state */ diff --git a/sysdeps/mach/hurd/mips/bits/sigcontext.h b/sysdeps/mach/hurd/mips/bits/sigcontext.h index deea841b62..14c618857e 100644 --- a/sysdeps/mach/hurd/mips/bits/sigcontext.h +++ b/sysdeps/mach/hurd/mips/bits/sigcontext.h @@ -1,4 +1,5 @@ -/* Copyright (C) 1994, 1997 Free Software Foundation, Inc. +/* Machine-dependent signal context structure for GNU Hurd. MIPS version. + Copyright (C) 1994,97,2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -16,10 +17,12 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#ifndef _SIGNAL_H +#if !defined _SIGNAL_H && !defined _SYS_UCONTEXT_H # error "Never use directly; include instead." #endif +#ifndef sc_mips_thread_state + /* Signal handlers are actually called: void handler (int sig, int code, struct sigcontext *scp); */ @@ -73,3 +76,5 @@ struct sigcontext int sc_fpcsr; /* FPU status register. */ int sc_fpeir; /* FP exception instruction register. */ }; + +#endif /* sc_mips_thread_state */