Avoid collison with error(), clean up code a bit.

[tcpdump] / ah.h

diff --git a/ah.h b/ah.h
index c22806afe8503e718b78e42ef4290329e6a902c5..d87a087e1a891c4391686df24f48d01d376a32cc 100644 (file)
--- a/ah.h
+++ b/ah.h
@@ -38,19 +38,19 @@
 #define _NETINET6_AH_H_
 
 struct ah {
 #define _NETINET6_AH_H_
 
 struct ah {

-       u_int8_t        ah_nxt;         /* Next Header */
-       u_int8_t        ah_len;         /* Length of data, in 32bit */
-       u_int16_t       ah_reserve;     /* Reserved for future use */
-       u_int32_t       ah_spi;         /* Security parameter index */
+       uint8_t         ah_nxt;         /* Next Header */
+       uint8_t         ah_len;         /* Length of data, in 32bit */
+       uint16_t        ah_reserve;     /* Reserved for future use */
+       uint32_t        ah_spi;         /* Security parameter index */

        /* variable size, 32bit bound*/ /* Authentication data */
 };
 
 struct newah {
        /* variable size, 32bit bound*/ /* Authentication data */
 };
 
 struct newah {

-       u_int8_t        ah_nxt;         /* Next Header */
-       u_int8_t        ah_len;         /* Length of data + 1, in 32bit */
-       u_int16_t       ah_reserve;     /* Reserved for future use */
-       u_int32_t       ah_spi;         /* Security parameter index */
-       u_int32_t       ah_seq;         /* Sequence number field */
+       uint8_t         ah_nxt;         /* Next Header */
+       uint8_t         ah_len;         /* Length of data + 1, in 32bit */
+       uint16_t        ah_reserve;     /* Reserved for future use */
+       uint32_t        ah_spi;         /* Security parameter index */
+       uint32_t        ah_seq;         /* Sequence number field */

        /* variable size, 32bit bound*/ /* Authentication data */
 };
 
        /* variable size, 32bit bound*/ /* Authentication data */
 };