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 <sys/cdefs.h>
+
 /*
  * 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 <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

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 <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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to