[src/trunk]: src/sys/compat/osf1 Fix namespace clash caused by addition of si...

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

details:   https://anonhg.NetBSD.org/src/rev/7218aff4610d
branches:  trunk
changeset: 539846:7218aff4610d
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Nov 27 14:36:12 2002 +0000

description:
Fix namespace clash caused by addition of sigaction(2).

diffstat:

 sys/compat/osf1/osf1.h     |  4 ++--
 sys/compat/osf1/osf1_cvt.c |  8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 7e1a3d3be3f8 -r 7218aff4610d sys/compat/osf1/osf1.h
--- a/sys/compat/osf1/osf1.h    Wed Nov 27 13:47:15 2002 +0000
+++ b/sys/compat/osf1/osf1.h    Wed Nov 27 14:36:12 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1.h,v 1.23 2001/04/04 19:52:18 ross Exp $ */
+/* $NetBSD: osf1.h,v 1.24 2002/11/27 14:36:12 tron Exp $ */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -411,7 +411,7 @@
 /* signal.h (some in machine/signal.h) */
 
 struct osf1_sigaction {
-       osf1_fcn_ptr    sa_handler;
+       osf1_fcn_ptr    sa_osf1_handler;
        osf1_sigset_t   sa_mask;
        osf1_int        sa_flags;
        osf1_int        sa_signo;
diff -r 7e1a3d3be3f8 -r 7218aff4610d sys/compat/osf1/osf1_cvt.c
--- a/sys/compat/osf1/osf1_cvt.c        Wed Nov 27 13:47:15 2002 +0000
+++ b/sys/compat/osf1/osf1_cvt.c        Wed Nov 27 14:36:12 2002 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_cvt.c,v 1.13 2002/03/31 22:22:48 christos Exp $ */
+/* $NetBSD: osf1_cvt.c,v 1.14 2002/11/27 14:36:12 tron Exp $ */
 
 /*
  * Copyright (c) 1999 Christopher G. Demetriou.  All rights reserved.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: osf1_cvt.c,v 1.13 2002/03/31 22:22:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_cvt.c,v 1.14 2002/11/27 14:36:12 tron Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -523,7 +523,7 @@
        struct osf1_sigaction *osa;
 {
 
-       osa->sa_handler = bsa->sa_handler;
+       osa->sa_osf1_handler = bsa->sa_handler;
        osf1_cvt_sigset_from_native(&bsa->sa_mask, &osa->sa_mask);
 
         /* translate flags */
@@ -537,7 +537,7 @@
        struct sigaction *bsa;
 {
 
-       bsa->sa_handler = osa->sa_handler;
+       bsa->sa_handler = osa->sa_osf1_handler;
        osf1_cvt_sigset_to_native(&osa->sa_mask, &bsa->sa_mask);
 
         /* translate flags */