From owner-svn-src-head@FreeBSD.ORG Tue May 21 21:20:11 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 454A67CF; Tue, 21 May 2013 21:20:11 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 374D9F3E; Tue, 21 May 2013 21:20:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4LLKBDI063573; Tue, 21 May 2013 21:20:11 GMT (envelope-from ed@svn.freebsd.org) Received: (from ed@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4LLKAY8063568; Tue, 21 May 2013 21:20:10 GMT (envelope-from ed@svn.freebsd.org) Message-Id: <201305212120.r4LLKAY8063568@svn.freebsd.org> From: Ed Schouten Date: Tue, 21 May 2013 21:20:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r250887 - in head: include include/arpa sys/net X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 May 2013 21:20:11 -0000 Author: ed Date: Tue May 21 21:20:10 2013 New Revision: 250887 URL: http://svnweb.freebsd.org/changeset/base/250887 Log: Allow certain headers to be included more easily. Spotted by: http://hacks.owlfolio.org/header-survey/ Modified: head/include/arpa/tftp.h head/include/fts.h head/include/ifaddrs.h head/sys/net/ppp_defs.h Modified: head/include/arpa/tftp.h ============================================================================== --- head/include/arpa/tftp.h Tue May 21 20:56:27 2013 (r250886) +++ head/include/arpa/tftp.h Tue May 21 21:20:10 2013 (r250887) @@ -33,6 +33,8 @@ #ifndef _ARPA_TFTP_H_ #define _ARPA_TFTP_H_ +#include + /* * Trivial File Transfer Protocol (IEN-133) */ Modified: head/include/fts.h ============================================================================== --- head/include/fts.h Tue May 21 20:56:27 2013 (r250886) +++ head/include/fts.h Tue May 21 21:20:10 2013 (r250887) @@ -33,15 +33,17 @@ #ifndef _FTS_H_ #define _FTS_H_ +#include + typedef struct { struct _ftsent *fts_cur; /* current node */ struct _ftsent *fts_child; /* linked list of children */ struct _ftsent **fts_array; /* sort array */ - dev_t fts_dev; /* starting device # */ + __dev_t fts_dev; /* starting device # */ char *fts_path; /* path for this descent */ int fts_rfd; /* fd for root */ - size_t fts_pathlen; /* sizeof(path) */ - size_t fts_nitems; /* elements in the sort array */ + __size_t fts_pathlen; /* sizeof(path) */ + __size_t fts_nitems; /* elements in the sort array */ int (*fts_compar) /* compare function */ (const struct _ftsent * const *, const struct _ftsent * const *); @@ -72,12 +74,12 @@ typedef struct _ftsent { char *fts_path; /* root path */ int fts_errno; /* errno for this node */ int fts_symfd; /* fd for symlink */ - size_t fts_pathlen; /* strlen(fts_path) */ - size_t fts_namelen; /* strlen(fts_name) */ + __size_t fts_pathlen; /* strlen(fts_path) */ + __size_t fts_namelen; /* strlen(fts_name) */ - ino_t fts_ino; /* inode */ - dev_t fts_dev; /* device */ - nlink_t fts_nlink; /* link count */ + __ino_t fts_ino; /* inode */ + __dev_t fts_dev; /* device */ + __nlink_t fts_nlink; /* link count */ #define FTS_ROOTPARENTLEVEL -1 #define FTS_ROOTLEVEL 0 Modified: head/include/ifaddrs.h ============================================================================== --- head/include/ifaddrs.h Tue May 21 20:56:27 2013 (r250886) +++ head/include/ifaddrs.h Tue May 21 21:20:10 2013 (r250887) @@ -31,7 +31,7 @@ struct ifaddrs { struct ifaddrs *ifa_next; char *ifa_name; - u_int ifa_flags; + unsigned int ifa_flags; struct sockaddr *ifa_addr; struct sockaddr *ifa_netmask; struct sockaddr *ifa_dstaddr; Modified: head/sys/net/ppp_defs.h ============================================================================== --- head/sys/net/ppp_defs.h Tue May 21 20:56:27 2013 (r250886) +++ head/sys/net/ppp_defs.h Tue May 21 21:20:10 2013 (r250887) @@ -31,6 +31,8 @@ #ifndef _PPP_DEFS_H_ #define _PPP_DEFS_H_ +#include + /* * The basic PPP frame. */ @@ -83,7 +85,7 @@ /* * Extended asyncmap - allows any character to be escaped. */ -typedef u_int32_t ext_accm[8]; +typedef __uint32_t ext_accm[8]; /* * What to do with network protocol (NP) packets. @@ -143,8 +145,8 @@ struct ppp_comp_stats { * the last NP packet was sent or received. */ struct ppp_idle { - time_t xmit_idle; /* time since last NP packet sent */ - time_t recv_idle; /* time since last NP packet received */ + __time_t xmit_idle; /* time since last NP packet sent */ + __time_t recv_idle; /* time since last NP packet received */ }; #ifndef __P