Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/kern/uipc_socket.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.34
retrieving revision 1.35.2.1
diff -u -p -r1.34 -r1.35.2.1
--- src/sys/kern/uipc_socket.c	1998/04/27 13:31:45	1.34
+++ src/sys/kern/uipc_socket.c	1998/08/08 03:06:58	1.35.2.1
@@ -1,4 +1,4 @@
-/*	$NetBSD: uipc_socket.c,v 1.34 1998/04/27 13:31:45 kleink Exp $	*/
+/*	$NetBSD: uipc_socket.c,v 1.35.2.1 1998/08/08 03:06:58 eeh Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1988, 1990, 1993
@@ -35,6 +35,8 @@
  *	@(#)uipc_socket.c	8.6 (Berkeley) 5/2/95
  */
 
+#include "opt_compat_sunos.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
@@ -840,7 +842,7 @@ sorflush(so)
 	socantrcvmore(so);
 	sbunlock(sb);
 	asb = *sb;
-	bzero((caddr_t)sb, sizeof (*sb));
+	bzero((caddr_t)sb, sizeof(*sb));
 	splx(s);
 	if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose)
 		(*pr->pr_domain->dom_dispose)(asb.sb_mb);
@@ -865,7 +867,7 @@ sosetopt(so, level, optname, m0)
 		switch (optname) {
 
 		case SO_LINGER:
-			if (m == NULL || m->m_len != sizeof (struct linger)) {
+			if (m == NULL || m->m_len != sizeof(struct linger)) {
 				error = EINVAL;
 				goto bad;
 			}
@@ -881,7 +883,7 @@ sosetopt(so, level, optname, m0)
 		case SO_REUSEPORT:
 		case SO_OOBINLINE:
 		case SO_TIMESTAMP:
-			if (m == NULL || m->m_len < sizeof (int)) {
+			if (m == NULL || m->m_len < sizeof(int)) {
 				error = EINVAL;
 				goto bad;
 			}
@@ -898,7 +900,7 @@ sosetopt(so, level, optname, m0)
 		    {
 			int optval;
 
-			if (m == NULL || m->m_len < sizeof (int)) {
+			if (m == NULL || m->m_len < sizeof(int)) {
 				error = EINVAL;
 				goto bad;
 			}
@@ -949,7 +951,7 @@ sosetopt(so, level, optname, m0)
 			struct timeval *tv;
 			short val;
 
-			if (m == NULL || m->m_len < sizeof (*tv)) {
+			if (m == NULL || m->m_len < sizeof(*tv)) {
 				error = EINVAL;
 				goto bad;
 			}
@@ -1004,12 +1006,12 @@ sogetopt(so, level, optname, mp)
 			return (ENOPROTOOPT);
 	} else {
 		m = m_get(M_WAIT, MT_SOOPTS);
-		m->m_len = sizeof (int);
+		m->m_len = sizeof(int);
 
 		switch (optname) {
 
 		case SO_LINGER:
-			m->m_len = sizeof (struct linger);
+			m->m_len = sizeof(struct linger);
 			mtod(m, struct linger *)->l_onoff =
 				so->so_options & SO_LINGER;
 			mtod(m, struct linger *)->l_linger = so->so_linger;