[src/trunk]: src/sys/compat/netbsd32 kill gcc warnings.

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

details:   https://anonhg.NetBSD.org/src/rev/2e2a5e0b4c9d
branches:  trunk
changeset: 499351:2e2a5e0b4c9d
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Nov 18 02:00:50 2000 +0000

description:
kill gcc warnings.

diffstat:

 sys/compat/netbsd32/netbsd32.h           |   4 ++--
 sys/compat/netbsd32/netbsd32_compat_10.c |  11 ++++++-----
 sys/compat/netbsd32/netbsd32_compat_14.c |   8 ++++----
 3 files changed, 12 insertions(+), 11 deletions(-)

diffs (95 lines):

diff -r 3f4e993c1d2b -r 2e2a5e0b4c9d sys/compat/netbsd32/netbsd32.h
--- a/sys/compat/netbsd32/netbsd32.h    Sat Nov 18 00:51:29 2000 +0000
+++ b/sys/compat/netbsd32/netbsd32.h    Sat Nov 18 02:00:50 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32.h,v 1.12 2000/08/22 03:35:14 mrg Exp $        */
+/*     $NetBSD: netbsd32.h,v 1.13 2000/11/18 02:00:50 mrg Exp $        */
 
 /*
  * Copyright (c) 1998 Matthew R. Green
@@ -257,7 +257,7 @@
 };
 
 struct netbsd32_semid_ds14 {
-       struct netbsd32_ipc_perm        sem_perm;/* operation permission struct */
+       struct netbsd32_ipc_perm14      sem_perm;/* operation permission struct */
        netbsd32_semp_t sem_base;       /* pointer to first semaphore in set */
        unsigned short  sem_nsems;      /* number of sems in set */
        netbsd32_time_t sem_otime;              /* last operation time */
diff -r 3f4e993c1d2b -r 2e2a5e0b4c9d sys/compat/netbsd32/netbsd32_compat_10.c
--- a/sys/compat/netbsd32/netbsd32_compat_10.c  Sat Nov 18 00:51:29 2000 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_10.c  Sat Nov 18 02:00:50 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_compat_10.c,v 1.6 2000/06/28 15:39:31 mrg Exp $       */
+/*     $NetBSD: netbsd32_compat_10.c,v 1.7 2000/11/18 02:00:50 mrg Exp $       */
 
 /*
  * Copyright (c) 1994 Adam Glass and Charles M. Hannum.  All rights reserved.
@@ -45,7 +45,7 @@
 #include <compat/netbsd32/netbsd32.h>
 #include <compat/netbsd32/netbsd32_syscallargs.h>
 
-#ifdef SYSVSEM
+#if (defined(SYSVSEM) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
 int
 netbsd32_compat_10_sys_semsys(p, v, retval)
        struct proc *p;
@@ -113,7 +113,7 @@
 }
 #endif
 
-#ifdef SYSVSHM
+#if (defined(SYSVSHM) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
 int
 netbsd32_compat_10_sys_shmsys(p, v, retval)
        struct proc *p;
@@ -155,7 +155,8 @@
        case 1:                                         /* shmctl() */
                SCARG(&shmctl_args, shmid) = SCARG(uap, a2);
                SCARG(&shmctl_args, cmd) = SCARG(uap, a3);
-               SCARG(&shmctl_args, buf) = (struct shmid_ds14 *)SCARG(uap, a4);
+               SCARG(&shmctl_args, buf) =
+                   (struct netbsd32_shmid_ds14 *)SCARG(uap, a4);
                return (compat_14_sys_shmctl(p, &shmctl_args, retval));
 
        case 2:                                         /* shmdt() */
@@ -174,7 +175,7 @@
 }
 #endif
 
-#ifdef SYSVMSG
+#if (defined(SYSVMSG) || !defined(_KERNEL)) && !defined(alpha) && defined(COMPAT_10)
 int
 netbsd32_compat_10_sys_msgsys(p, v, retval)
        struct proc *p;
diff -r 3f4e993c1d2b -r 2e2a5e0b4c9d sys/compat/netbsd32/netbsd32_compat_14.c
--- a/sys/compat/netbsd32/netbsd32_compat_14.c  Sat Nov 18 00:51:29 2000 +0000
+++ b/sys/compat/netbsd32/netbsd32_compat_14.c  Sat Nov 18 02:00:50 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_compat_14.c,v 1.3 2000/07/09 13:39:31 mrg Exp $       */
+/*     $NetBSD: netbsd32_compat_14.c,v 1.4 2000/11/18 02:00:50 mrg Exp $       */
 
 /*
  * Copyright (c) 1999 Eduardo E. Horvath
@@ -198,7 +198,7 @@
        struct netbsd32_shmid_ds14 *oshmbuf;
 {
 
-       native_to_ipc_perm14(&shmbuf->shm_perm, &oshmbuf->shm_perm);
+       native_to_netbsd32_ipc_perm14(&shmbuf->shm_perm, &oshmbuf->shm_perm);
 
 #define        CVT(x)  oshmbuf->x = shmbuf->x
        CVT(shm_segsz);
@@ -317,10 +317,10 @@
        struct compat_14_netbsd32_shmctl_args /* {
                syscallarg(int) shmid;
                syscallarg(int) cmd;
-               syscallarg(struct shmid_ds14 *) buf;
+               syscallarg(struct netbsd32_shmid_ds14 *) buf;
        } */ *uap = v;
        struct shmid_ds shmbuf;
-       struct shmid_ds14 oshmbuf;
+       struct netbsd32_shmid_ds14 oshmbuf;
        int cmd, error;
 
        cmd = SCARG(uap, cmd);