Don't use n_* types

diff --git a/includes/netinet/ip.h b/includes/netinet/ip.h
index 54b45e31234eb4c621ba6c5b71f80f5a0851789d..233abd6e69b5362350d42c957af94d0a4a5792b0 100644 (file)
--- a/includes/netinet/ip.h
+++ b/includes/netinet/ip.h
@@ -138,10 +138,10 @@ struct    ip_timestamp {
                 ipt_flg:4;             /* flags, see below */
 #endif
        union ipt_timestamp {
-                n_time ipt_time[1];
+                u_int32_t ipt_time[1];
                 struct ipt_ta {
                        struct in_addr ipt_addr;
-                       n_time ipt_time;
+                       u_int32_t ipt_time;
                 } ipt_ta[1];
        } ipt_timestamp;
 };

diff --git a/includes/netinet/ip_icmp.h b/includes/netinet/ip_icmp.h
index 085a9ba96c2750d6608146a321b19d4cf2d5680e..8fffb58b7362e141b0f84dea4301f020d90a3115 100644 (file)
--- a/includes/netinet/ip_icmp.h
+++ b/includes/netinet/ip_icmp.h
@@ -60,15 +60,15 @@ struct icmp {
                u_int8_t  ih_pptr;              /* ICMP_PARAMPROB */
                struct in_addr ih_gwaddr;       /* ICMP_REDIRECT */
                struct ih_idseq {
-                         n_short icd_id;
-                         n_short icd_seq;
+                         int16_t icd_id;
+                         int16_t icd_seq;
                } ih_idseq;
                int32_t   ih_void;
 
                /* ICMP_UNREACH_NEEDFRAG -- Path MTU Discovery (RFC1191) */
                struct ih_pmtu {
-                         n_short ipm_void;    
-                         n_short ipm_nextmtu;
+                         int16_t ipm_void;    
+                         int16_t ipm_nextmtu;
                } ih_pmtu;
                struct ih_rtradv {
                        u_int8_t irt_num_addrs;
@@ -88,9 +88,9 @@ struct icmp {
 #define icmp_lifetime    icmp_hun.ih_rtradv.irt_lifetime
        union {
                struct id_ts {
-                         n_time its_otime;
-                         n_time its_rtime;
-                         n_time its_ttime;
+                         u_int32_t its_otime;
+                         u_int32_t its_rtime;
+                         u_int32_t its_ttime;
                } id_ts;
                struct id_ip  {
                          struct ip idi_ip;
@@ -118,7 +118,7 @@ struct icmp {
  * ip header length.
  */
 #define        ICMP_MINLEN     8                               /* abs minimum */
-#define        ICMP_TSLEN      (8 + 3 * sizeof (n_time))       /* timestamp */
+#define        ICMP_TSLEN      (8 + 3 * sizeof (u_int32_t))    /* timestamp */
 #define        ICMP_MASKLEN    12                              /* address mask */
 #define        ICMP_ADVLENMIN  (8 + sizeof (struct ip) + 8)    /* min */
 #define        ICMP_ADVLEN(p)  (8 + ((p)->icmp_ip.ip_hl << 2) + 8)