--- a/packages/net/bsd_tcpip/current/ChangeLog
+++ b/packages/net/bsd_tcpip/current/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-10  Gary Thomas  <gary@chez-thomas.org>
+
+	* src/sys/netinet/udp_usrreq.c: 
+	* src/sys/netinet/tcp_subr.c: 
+	* src/sys/netinet/in_pcb.c: Rename 'errno' function parameter
+	since some compilers have problems with this.
+
 2002-07-08  Gary Thomas  <gary@chez-thomas.org>
 
 	* include/sys/param.h: Need <errno.h> which may or may not be

--- a/packages/net/bsd_tcpip/current/src/sys/netinet/in_pcb.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet/in_pcb.c
@@ -581,7 +581,7 @@ in_setpeeraddr(so, nam)
 }
 
 void
-in_pcbnotifyall(head, faddr, errno, notify)
+in_pcbnotifyall(head, faddr, _errno, notify)
 	struct inpcbhead *head;
 	struct in_addr faddr;
 	void (*notify) __P((struct inpcb *, int));
@@ -599,7 +599,7 @@ in_pcbnotifyall(head, faddr, errno, noti
 		if (inp->inp_faddr.s_addr != faddr.s_addr ||
 		    inp->inp_socket == NULL)
 				continue;
-		(*notify)(inp, errno);
+		(*notify)(inp, _errno);
 	}
 	splx(s);
 }
@@ -680,9 +680,9 @@ in_losing(inp)
  * and allocate a (hopefully) better one.
  */
 void
-in_rtchange(inp, errno)
+in_rtchange(inp, _errno)
 	register struct inpcb *inp;
-	int errno;
+	int _errno;
 {
 	if (inp->inp_route.ro_rt) {
 		rtfree(inp->inp_route.ro_rt);

--- a/packages/net/bsd_tcpip/current/src/sys/netinet/tcp_subr.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet/tcp_subr.c
@@ -533,9 +533,9 @@ tcp_newtcpcb(inp)
  * then send a RST to peer.
  */
 struct tcpcb *
-tcp_drop(tp, errno)
+tcp_drop(tp, _errno)
 	register struct tcpcb *tp;
-	int errno;
+	int _errno;
 {
 	struct socket *so = tp->t_inpcb->inp_socket;
 
@@ -545,9 +545,9 @@ tcp_drop(tp, errno)
 		tcpstat.tcps_drops++;
 	} else
 		tcpstat.tcps_conndrops++;
-	if (errno == ETIMEDOUT && tp->t_softerror)
-		errno = tp->t_softerror;
-	so->so_error = errno;
+	if (_errno == ETIMEDOUT && tp->t_softerror)
+		_errno = tp->t_softerror;
+	so->so_error = _errno;
 	return (tcp_close(tp));
 }
 
@@ -1002,9 +1002,9 @@ tcp_new_isn(tp)
  * to one segment.  We will gradually open it again as we proceed.
  */
 void
-tcp_quench(inp, errno)
+tcp_quench(inp, _errno)
 	struct inpcb *inp;
-	int errno;
+	int _errno;
 {
 	struct tcpcb *tp = intotcpcb(inp);
 
@@ -1018,14 +1018,14 @@ tcp_quench(inp, errno)
  * is controlled by the icmp_may_rst sysctl.
  */
 void
-tcp_drop_syn_sent(inp, errno)
+tcp_drop_syn_sent(inp, _errno)
 	struct inpcb *inp;
-	int errno;
+	int _errno;
 {
 	struct tcpcb *tp = intotcpcb(inp);
 
 	if (tp && tp->t_state == TCPS_SYN_SENT)
-		tcp_drop(tp, errno);
+		tcp_drop(tp, _errno);
 }
 
 /*
@@ -1035,9 +1035,9 @@ tcp_drop_syn_sent(inp, errno)
  * This duplicates some code in the tcp_mss() function in tcp_input.c.
  */
 void
-tcp_mtudisc(inp, errno)
+tcp_mtudisc(inp, _errno)
 	struct inpcb *inp;
-	int errno;
+	int _errno;
 {
 	struct tcpcb *tp = intotcpcb(inp);
 	struct rtentry *rt;

--- a/packages/net/bsd_tcpip/current/src/sys/netinet/udp_usrreq.c
+++ b/packages/net/bsd_tcpip/current/src/sys/netinet/udp_usrreq.c
@@ -514,11 +514,11 @@ udp_append(last, ip, n, off)
  * just wake up so that he can collect error status.
  */
 void
-udp_notify(inp, errno)
+udp_notify(inp, _errno)
 	register struct inpcb *inp;
-	int errno;
+	int _errno;
 {
-	inp->inp_socket->so_error = errno;
+	inp->inp_socket->so_error = _errno;
 	sorwakeup(inp->inp_socket);
 	sowwakeup(inp->inp_socket);
 }