From e330ffed34b2f6e051f17d8ba76ddb22d23be22c Mon Sep 17 00:00:00 2001
From: eeh <eeh@NetBSD.org>
Date: Wed, 28 Feb 2001 15:58:35 +0000
Subject: [PATCH] Remove conflicts with changes made to COMPAT_SVR4.

---
 sys/compat/svr4_32/svr4_32_signal.c | 3 +--
 sys/compat/svr4_32/svr4_32_signal.h | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys/compat/svr4_32/svr4_32_signal.c b/sys/compat/svr4_32/svr4_32_signal.c
index ff029461920f..d391d8ceca28 100644
--- a/sys/compat/svr4_32/svr4_32_signal.c
+++ b/sys/compat/svr4_32/svr4_32_signal.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_signal.c,v 1.1 2001/02/06 16:37:58 eeh Exp $	 */
+/*	$NetBSD: svr4_32_signal.c,v 1.2 2001/02/28 15:58:35 eeh Exp $	 */
 
 /*-
  * Copyright (c) 1994, 1998 The NetBSD Foundation, Inc.
@@ -74,7 +74,6 @@ void native_to_svr4_32_sigaction __P((const struct sigaction *,
 				struct svr4_32_sigaction *));
 
 #ifdef COMPAT_SVR4
-extern int native_to_svr4_sig[];
 extern int svr4_to_native_sig[];
 #else
 int native_to_svr4_sig[NSIG] = {
diff --git a/sys/compat/svr4_32/svr4_32_signal.h b/sys/compat/svr4_32/svr4_32_signal.h
index f63e256d4dc3..b7ef0d93ca80 100644
--- a/sys/compat/svr4_32/svr4_32_signal.h
+++ b/sys/compat/svr4_32/svr4_32_signal.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: svr4_32_signal.h,v 1.1 2001/02/06 16:37:58 eeh Exp $	 */
+/*	$NetBSD: svr4_32_signal.h,v 1.2 2001/02/28 15:58:35 eeh Exp $	 */
 
 /*-
  * Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -40,6 +40,7 @@
 #define	_SVR4_32_SIGNAL_H_
 
 #include <compat/svr4_32/svr4_32_siginfo.h>
+#include <compat/svr4/svr4_signal.h>
 
 
 typedef netbsd32_caddr_t svr4_32_sig_t;
@@ -68,7 +69,6 @@ struct svr4_32_sigaltstack {
 };
 typedef netbsd32_caddr_t svr4_32_sigaltstackp;
 
-extern int native_to_svr4_sig[];
 void native_to_svr4_32_sigset __P((const sigset_t *, svr4_32_sigset_t *));
 void svr4_32_to_native_sigset __P((const svr4_32_sigset_t *, sigset_t *));
 void native_to_svr4_32_sigaltstack __P((const struct sigaltstack *, struct svr4_32_sigaltstack *));