summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormiod <miod@openbsd.org>2004-02-01 15:39:37 +0000
committermiod <miod@openbsd.org>2004-02-01 15:39:37 +0000
commitd38ca442f7ddcf8097be225ee89a1ebb1562b2a2 (patch)
tree1f73a00284098865b5f30420dbf20b4dc0db319c
parentadd paper.txt target; (diff)
downloadwireguard-openbsd-d38ca442f7ddcf8097be225ee89a1ebb1562b2a2.tar.xz
wireguard-openbsd-d38ca442f7ddcf8097be225ee89a1ebb1562b2a2.zip
Trivial touches to compile with gcc 3.
-rw-r--r--sys/arch/sparc/dev/cgtworeg.h4
-rw-r--r--sys/arch/sparc/dev/dma.c3
-rw-r--r--sys/compat/sunos/sunos_ioctl.c4
3 files changed, 7 insertions, 4 deletions
diff --git a/sys/arch/sparc/dev/cgtworeg.h b/sys/arch/sparc/dev/cgtworeg.h
index 430f96cf3ba..73b74dcb172 100644
--- a/sys/arch/sparc/dev/cgtworeg.h
+++ b/sys/arch/sparc/dev/cgtworeg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: cgtworeg.h,v 1.1 2002/08/12 10:44:04 miod Exp $ */
+/* $OpenBSD: cgtworeg.h,v 1.2 2004/02/01 15:39:37 miod Exp $ */
/* $NetBSD: cgtworeg.h,v 1.3 1995/10/04 00:21:27 pk Exp $ */
/*
@@ -137,7 +137,7 @@ struct dblbufreg {
*/
struct cg2_zoom {
union {
- u_int short reg;
+ u_short reg;
u_char reg_pad[4096];
} wordpan;
union {
diff --git a/sys/arch/sparc/dev/dma.c b/sys/arch/sparc/dev/dma.c
index 7f4565b17f7..50a5bdacac4 100644
--- a/sys/arch/sparc/dev/dma.c
+++ b/sys/arch/sparc/dev/dma.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dma.c,v 1.18 2003/06/05 12:27:02 deraadt Exp $ */
+/* $OpenBSD: dma.c,v 1.19 2004/02/01 15:39:37 miod Exp $ */
/* $NetBSD: dma.c,v 1.46 1997/08/27 11:24:16 bouyer Exp $ */
/*
@@ -356,6 +356,7 @@ dma_reset(sc, isledma)
DMACSR(sc) |= 0x800;
break;
default:
+ break;
}
sc->sc_active = 0; /* and of course we aren't */
diff --git a/sys/compat/sunos/sunos_ioctl.c b/sys/compat/sunos/sunos_ioctl.c
index fbb9e2813fb..188f77c14d0 100644
--- a/sys/compat/sunos/sunos_ioctl.c
+++ b/sys/compat/sunos/sunos_ioctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sunos_ioctl.c,v 1.14 2003/01/04 22:36:12 deraadt Exp $ */
+/* $OpenBSD: sunos_ioctl.c,v 1.15 2004/02/01 15:39:38 miod Exp $ */
/* $NetBSD: sunos_ioctl.c,v 1.23 1996/03/14 19:33:46 christos Exp $ */
/*
@@ -1028,6 +1028,7 @@ sunos_sys_fcntl(p, v, retval)
return (EOPNOTSUPP);
default:
+ break;
}
ret = sys_fcntl(p, uap, retval);
@@ -1043,6 +1044,7 @@ sunos_sys_fcntl(p, v, retval)
}
break;
default:
+ break;
}
return (ret);