2009-02-10 Roland McGrath <roland@redhat.com>

	* configure.ac: Check for struct sigcontext.
	* signal.c [LINUX] [M68K] (struct sigcontext): Don't define it if
	[HAVE_STRUCT_SIGCONTEXT].
	From Muttley Meen <muttley.meen@gmail.com>.

2 files changed, 3 insertions, 2 deletions

diff --git a/configure.ac b/configure.ac
index 3554ab6fe..fb7778878 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,7 +202,8 @@ AC_CHECK_HEADERS([linux/icmp.h linux/in6.h linux/netlink.h linux/if_packet.h],
                  [], [], [#include <stddef.h>
 #include <linux/socket.h>])
 AC_CHECK_HEADERS([asm/sigcontext.h], [], [], [#include <signal.h>])
-AC_CHECK_TYPES([struct sigcontext_struct],,, [#include <signal.h>])
+AC_CHECK_TYPES([struct sigcontext_struct,
+		struct sigcontext],,, [#include <signal.h>])
 AC_CHECK_HEADERS([netinet/tcp.h netinet/udp.h],,, [#include <netinet/in.h>])
 
 AC_MP_PROCFS
diff --git a/signal.c b/signal.c
index 963bf0f6e..9f4edd91c 100644
--- a/signal.c
+++ b/signal.c
@@ -133,7 +133,7 @@ struct sigcontext_struct {
 	unsigned long cr2;
 };
 #else /* !I386 */
-#ifdef M68K
+#if defined M68K && !defined HAVE_STRUCT_SIGCONTEXT
 struct sigcontext
 {
 	unsigned long sc_mask;