[src/trunk]: src/sys/arch/m68k/include namespace sanity: don't expose compati...

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

details:   https://anonhg.NetBSD.org/src/rev/dfbd4700ff54
branches:  trunk
changeset: 584088:dfbd4700ff54
user:      drochner <drochner%NetBSD.org@localhost>
date:      Wed Sep 07 19:42:51 2005 +0000

description:
namespace sanity: don't expose compatibility sigcontext stuff
unnecessarily

diffstat:

 sys/arch/m68k/include/frame.h  |  7 ++++---
 sys/arch/m68k/include/signal.h |  4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diffs (55 lines):

diff -r d339af8669f3 -r dfbd4700ff54 sys/arch/m68k/include/frame.h
--- a/sys/arch/m68k/include/frame.h     Wed Sep 07 19:39:51 2005 +0000
+++ b/sys/arch/m68k/include/frame.h     Wed Sep 07 19:42:51 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: frame.h,v 1.24 2004/08/28 21:31:07 thorpej Exp $       */
+/*     $NetBSD: frame.h,v 1.25 2005/09/07 19:42:51 drochner Exp $      */
 
 /*
  * Copyright (c) 1982, 1990, 1993
@@ -211,9 +211,11 @@
 #define        FPF6_V_SNAN     6
 #define        FPF6_V_UNSUP    7
 
+#if defined(_KERNEL)
+
 #include <m68k/signal.h>
 
-#if defined(COMPAT_16) || !defined(_KERNEL)
+#if defined(COMPAT_16)
 /*
  * Stack frame layout when delivering a signal.
  */
@@ -236,7 +238,6 @@
        ucontext_t      sf_uc;          /* actual saved ucontext */
 };
 
-#if defined(_KERNEL)
 /*
  * Utility function to relocate the initial frame, make room to restore an
  * exception frame and reenter the syscall.
diff -r d339af8669f3 -r dfbd4700ff54 sys/arch/m68k/include/signal.h
--- a/sys/arch/m68k/include/signal.h    Wed Sep 07 19:39:51 2005 +0000
+++ b/sys/arch/m68k/include/signal.h    Wed Sep 07 19:42:51 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: signal.h,v 1.20 2004/07/29 12:54:46 is Exp $   */
+/*     $NetBSD: signal.h,v 1.21 2005/09/07 19:42:51 drochner Exp $     */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1991 Regents of the University of California.
@@ -72,6 +72,7 @@
 };
 #endif /* __LIBC12_SOURCE__ || _KERNEL */
 
+#if defined(_LIBC) || defined(_KERNEL)
 struct sigcontext {
        int     sc_onstack;             /* sigstack state to restore */
        int     __sc_mask13;            /* signal mask to restore (old style) */
@@ -82,6 +83,7 @@
        int     sc_ps;                  /* psl to restore */
        sigset_t sc_mask;               /* signal mask to restore (new style) */
 };
+#endif /* _LIBC || _KERNEL */
 
 #include <m68k/cpuframe.h>