Update.

1999-08-31  Scott Bambrough  <scottb@netwinder.org>

	* sysdeps/unix/sysv/linux/arm/bits/armsigctx.h: Enclose header in an
	#ifdef statement to prevent it from being included twice.
	* sysdeps/unix/sysv/linux/arm/sigcontextinfo.h:
	#include <bits/armsigctx.h>.

diff --git a/ChangeLog b/ChangeLog
index 5c750ee..93d3132 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+1999-08-31  Scott Bambrough  <scottb@netwinder.org>
+
+       * sysdeps/unix/sysv/linux/arm/bits/armsigctx.h: Enclose header in an
+       #ifdef statement to prevent it from being included twice.
+       * sysdeps/unix/sysv/linux/arm/sigcontextinfo.h:
+       #include <bits/armsigctx.h>.
+
 1999-08-31  Andreas Schwab  <schwab@suse.de>
 
        * locale/C-collate.c: Add missing initialisations.

diff --git a/sysdeps/unix/sysv/linux/arm/bits/armsigctx.h b/sysdeps/unix/sysv/linux/arm/bits/armsigctx.h
index ba78c03..3435a96 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/bits/armsigctx.h
+++ b/sysdeps/unix/sysv/linux/arm/bits/armsigctx.h
@@ -1,5 +1,5 @@
 /* Definition of `struct sigcontext' for Linux/ARM
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999 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
@@ -21,6 +21,9 @@
    Fortunately 2.0 puts a magic number in the first word and this is not
    a legal value for `trap_no', so we can tell them apart.  */
 
+#ifndef __ARMSIGCTX_H
+#define __ARMSIGCTX_H  1
+
 #include <asm/ptrace.h>
 
 union k_sigcontext
@@ -59,3 +62,5 @@ union k_sigcontext
 };
 
 #define SIGCONTEXT_2_0_MAGIC   0x4B534154
+
+#endif /* bits/armsigctx.h */

diff --git a/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h b/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h
index 51788e0..7f6ecbd 100644 (file)
--- a/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h
+++ b/sysdeps/unix/sysv/linux/arm/sigcontextinfo.h
@@ -17,6 +17,8 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#include <bits/armsigctx.h>
+
 #define SIGCONTEXT int _a2, int _a3, int _a4, union k_sigcontext
 #define SIGCONTEXT_EXTRA_ARGS _a2, _a3, _a4,