do not include asm/sigcontext.h on Linux/IA64 since it gets the struct from bits...

diff --git a/ChangeLog b/ChangeLog
index 32bc8aface2087cb6c24d331f0ddc7995c218390..1e924e0e69365b92c0968c08121f995b3c95de1f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-19   Wichert Akkerman <wakkerma@debian.org>
+
+  * signal.c: do not include asm/sigcontext.h on IA64 since it gets
+    the struct from bits/sigcontext.h already which signal.h includes.
+
 2001-08-03   Wichert Akkerman <wakkerma@debian.org>
 
   * linux/ioctlent.sh: change regexps so we catch sound ioctls as well in

diff --git a/signal.c b/signal.c
index 4ab56bba6b39a17bffa91237327920b35b5db8fd..8e3e3786dfdd39250cbd6b66757156e0778d7b03 100644 (file)
--- a/signal.c
+++ b/signal.c
@@ -83,7 +83,7 @@ typedef struct {
        struct regs             si_regs;
        int                     si_mask;
 } m_siginfo_t;
-#else
+#elif !defined(IA64)
 #include <asm/sigcontext.h>
 #endif /* SPARC */
 #else /* !HAVE_ASM_SIGCONTEXT_H */