[src/trunk]: src/sys/compat/svr4_32 Remove conflicts with changes made to COM...

[eeh <eeh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/65788a52c02a
branches:  trunk
changeset: 504374:65788a52c02a
user:      eeh <eeh%NetBSD.org@localhost>
date:      Wed Feb 28 15:58:35 2001 +0000

description:
Remove conflicts with changes made to COMPAT_SVR4.

diffstat:

 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(-)

diffs (42 lines):

diff -r ee2e9ce35fb9 -r 65788a52c02a sys/compat/svr4_32/svr4_32_signal.c
--- a/sys/compat/svr4_32/svr4_32_signal.c       Wed Feb 28 15:46:49 2001 +0000
+++ b/sys/compat/svr4_32/svr4_32_signal.c       Wed Feb 28 15:58:35 2001 +0000
@@ -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 @@
                                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 -r ee2e9ce35fb9 -r 65788a52c02a sys/compat/svr4_32/svr4_32_signal.h
--- a/sys/compat/svr4_32/svr4_32_signal.h       Wed Feb 28 15:46:49 2001 +0000
+++ b/sys/compat/svr4_32/svr4_32_signal.h       Wed Feb 28 15:58:35 2001 +0000
@@ -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 @@
 };
 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 *));