From owner-svn-src-all@FreeBSD.ORG  Fri Oct 21 12:58:34 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AC8531065676;
	Fri, 21 Oct 2011 12:58:34 +0000 (UTC) (envelope-from ed@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9BC0D8FC16;
	Fri, 21 Oct 2011 12:58:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p9LCwY47025205;
	Fri, 21 Oct 2011 12:58:34 GMT (envelope-from ed@svn.freebsd.org)
Received: (from ed@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p9LCwYXs025202;
	Fri, 21 Oct 2011 12:58:34 GMT (envelope-from ed@svn.freebsd.org)
Message-Id: <201110211258.p9LCwYXs025202@svn.freebsd.org>
From: Ed Schouten <ed@FreeBSD.org>
Date: Fri, 21 Oct 2011 12:58:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r226610 - in head/sys: net netinet
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 21 Oct 2011 12:58:34 -0000

Author: ed
Date: Fri Oct 21 12:58:34 2011
New Revision: 226610
URL: http://svn.freebsd.org/changeset/base/226610

Log:
  Add missing #includes.
  
  According to POSIX, these two header files should be able to be included
  by themselves, not depending on other headers. The <net/if.h> header
  uses struct sockaddr when __BSD_VISIBLE=1, while <netinet/tcp.h> uses
  integer datatypes (u_int32_t, u_short, etc).
  
  MFC after:	2 months

Modified:
  head/sys/net/if.h
  head/sys/netinet/tcp.h

Modified: head/sys/net/if.h
==============================================================================
--- head/sys/net/if.h	Fri Oct 21 11:11:18 2011	(r226609)
+++ head/sys/net/if.h	Fri Oct 21 12:58:34 2011	(r226610)
@@ -43,9 +43,11 @@
 /*
  * <net/if.h> does not depend on <sys/time.h> on most other systems.  This
  * helps userland compatibility.  (struct timeval ifi_lastchange)
+ * The same holds for <sys/socket.h>.  (struct sockaddr ifru_addr)
  */
 #ifndef _KERNEL
 #include <sys/time.h>
+#include <sys/socket.h>
 #endif
 
 struct ifnet;

Modified: head/sys/netinet/tcp.h
==============================================================================
--- head/sys/netinet/tcp.h	Fri Oct 21 11:11:18 2011	(r226609)
+++ head/sys/netinet/tcp.h	Fri Oct 21 12:58:34 2011	(r226610)
@@ -34,6 +34,7 @@
 #define _NETINET_TCP_H_
 
 #include <sys/cdefs.h>
+#include <sys/types.h>
 
 #if __BSD_VISIBLE