diff options
author | ed <ed@FreeBSD.org> | 2013-05-21 21:20:10 +0000 |
---|---|---|
committer | ed <ed@FreeBSD.org> | 2013-05-21 21:20:10 +0000 |
commit | c0a01b085895a1a896aa22ac6c9a06bec0d39442 (patch) | |
tree | d428e4aacc64240d1c710711b4bb8a97093ec296 | |
parent | 9adbac28e868932ac44ce3e626094ca2502efef8 (diff) | |
download | FreeBSD-src-c0a01b085895a1a896aa22ac6c9a06bec0d39442.zip FreeBSD-src-c0a01b085895a1a896aa22ac6c9a06bec0d39442.tar.gz |
Allow certain headers to be included more easily.
Spotted by: http://hacks.owlfolio.org/header-survey/
-rw-r--r-- | include/arpa/tftp.h | 2 | ||||
-rw-r--r-- | include/fts.h | 18 | ||||
-rw-r--r-- | include/ifaddrs.h | 2 | ||||
-rw-r--r-- | sys/net/ppp_defs.h | 8 |
4 files changed, 18 insertions, 12 deletions
diff --git a/include/arpa/tftp.h b/include/arpa/tftp.h index 5c2a4c7..20733ec 100644 --- a/include/arpa/tftp.h +++ b/include/arpa/tftp.h @@ -33,6 +33,8 @@ #ifndef _ARPA_TFTP_H_ #define _ARPA_TFTP_H_ +#include <sys/cdefs.h> + /* * Trivial File Transfer Protocol (IEN-133) */ diff --git a/include/fts.h b/include/fts.h index a679ea6..f453e2b 100644 --- a/include/fts.h +++ b/include/fts.h @@ -33,15 +33,17 @@ #ifndef _FTS_H_ #define _FTS_H_ +#include <sys/_types.h> + 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 diff --git a/include/ifaddrs.h b/include/ifaddrs.h index f0911a4..e768d50 100644 --- a/include/ifaddrs.h +++ b/include/ifaddrs.h @@ -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; diff --git a/sys/net/ppp_defs.h b/sys/net/ppp_defs.h index 386a176..5f6d410 100644 --- a/sys/net/ppp_defs.h +++ b/sys/net/ppp_defs.h @@ -31,6 +31,8 @@ #ifndef _PPP_DEFS_H_ #define _PPP_DEFS_H_ +#include <sys/_types.h> + /* * 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 |