From ed85e20e4d6a27d5405f37366dd34b64c10a9211 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 23 Apr 2014 00:20:40 -0700 Subject: u_intN_t is dead, long live uintN_t. And, as we require at least autoconf 2.61, and as autoconf 2.61 and later have AC_TYPE_UINTn_T and AC_TYPE_INTn_T macros, we use them to define the uintN_t and intN_t macros if the system doesn't define them for us. This lets us get rid of bitypes.h as well. --- print-tipc.c | 68 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'print-tipc.c') diff --git a/print-tipc.c b/print-tipc.c index 809c50db..b883fba9 100644 --- a/print-tipc.c +++ b/print-tipc.c @@ -63,8 +63,8 @@ static const char tstr[] = "[|TIPC]"; #define TIPC_NODE(addr) (((addr) >> 0) & 0xFFF) struct tipc_pkthdr { - u_int32_t w0; - u_int32_t w1; + uint32_t w0; + uint32_t w1; }; #define TIPC_VER(w0) (((w0) >> 29) & 0x07) @@ -107,30 +107,30 @@ static const struct tok tipc_linkconf_mtype_values[] = { }; struct payload_tipc_pkthdr { - u_int32_t w0; - u_int32_t w1; - u_int32_t w2; - u_int32_t prev_node; - u_int32_t orig_port; - u_int32_t dest_port; - u_int32_t orig_node; - u_int32_t dest_node; - u_int32_t name_type; - u_int32_t w9; - u_int32_t wA; + uint32_t w0; + uint32_t w1; + uint32_t w2; + uint32_t prev_node; + uint32_t orig_port; + uint32_t dest_port; + uint32_t orig_node; + uint32_t dest_node; + uint32_t name_type; + uint32_t w9; + uint32_t wA; }; struct internal_tipc_pkthdr { - u_int32_t w0; - u_int32_t w1; - u_int32_t w2; - u_int32_t prev_node; - u_int32_t w4; - u_int32_t w5; - u_int32_t orig_node; - u_int32_t dest_node; - u_int32_t trans_seq; - u_int32_t w9; + uint32_t w0; + uint32_t w1; + uint32_t w2; + uint32_t prev_node; + uint32_t w4; + uint32_t w5; + uint32_t orig_node; + uint32_t dest_node; + uint32_t trans_seq; + uint32_t w9; }; #define TIPC_SEQ_GAP(w1) (((w1) >> 16) & 0x1FFF) @@ -143,13 +143,13 @@ struct internal_tipc_pkthdr { #define TIPC_LINK_TOL(w9) (((w9) >> 0) & 0xFFFF) struct link_conf_tipc_pkthdr { - u_int32_t w0; - u_int32_t w1; - u_int32_t dest_domain; - u_int32_t prev_node; - u_int32_t ntwrk_id; - u_int32_t w5; - u_int8_t media_address[16]; + uint32_t w0; + uint32_t w1; + uint32_t dest_domain; + uint32_t prev_node; + uint32_t ntwrk_id; + uint32_t w5; + uint8_t media_address[16]; }; #define TIPC_NODE_SIG(w1) (((w1) >> 0) & 0xFFFF) @@ -158,7 +158,7 @@ struct link_conf_tipc_pkthdr { static void print_payload(netdissect_options *ndo, const struct payload_tipc_pkthdr *ap) { - u_int32_t w0, w1, w2; + uint32_t w0, w1, w2; u_int user; u_int hsize; u_int msize; @@ -223,7 +223,7 @@ trunc: static void print_internal(netdissect_options *ndo, const struct internal_tipc_pkthdr *ap) { - u_int32_t w0, w1, w2, w4, w5, w9; + uint32_t w0, w1, w2, w4, w5, w9; u_int user; u_int hsize; u_int msize; @@ -291,7 +291,7 @@ trunc: static void print_link_conf(netdissect_options *ndo, const struct link_conf_tipc_pkthdr *ap) { - u_int32_t w0, w1, w5; + uint32_t w0, w1, w5; u_int user; u_int hsize; u_int msize; @@ -339,7 +339,7 @@ tipc_print(netdissect_options *ndo, const u_char *bp, u_int length _U_, u_int caplen _U_) { const struct tipc_pkthdr *ap; - u_int32_t w0; + uint32_t w0; u_int user; ap = (struct tipc_pkthdr *)bp; -- cgit v1.2.1