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-ipx.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'print-ipx.c') diff --git a/print-ipx.c b/print-ipx.c index ea5a6545..93f5d595 100644 --- a/print-ipx.c +++ b/print-ipx.c @@ -46,21 +46,21 @@ /* IPX transport header */ struct ipxHdr { - u_int16_t cksum; /* Checksum */ - u_int16_t length; /* Length, in bytes, including header */ - u_int8_t tCtl; /* Transport Control (i.e. hop count) */ - u_int8_t pType; /* Packet Type (i.e. level 2 protocol) */ - u_int16_t dstNet[2]; /* destination net */ - u_int8_t dstNode[6]; /* destination node */ - u_int16_t dstSkt; /* destination socket */ - u_int16_t srcNet[2]; /* source net */ - u_int8_t srcNode[6]; /* source node */ - u_int16_t srcSkt; /* source socket */ + uint16_t cksum; /* Checksum */ + uint16_t length; /* Length, in bytes, including header */ + uint8_t tCtl; /* Transport Control (i.e. hop count) */ + uint8_t pType; /* Packet Type (i.e. level 2 protocol) */ + uint16_t dstNet[2]; /* destination net */ + uint8_t dstNode[6]; /* destination node */ + uint16_t dstSkt; /* destination socket */ + uint16_t srcNet[2]; /* source net */ + uint8_t srcNode[6]; /* source node */ + uint16_t srcSkt; /* source socket */ }; #define ipxSize 30 -static const char *ipxaddr_string(u_int32_t, const u_char *); +static const char *ipxaddr_string(uint32_t, const u_char *); static void ipx_decode(netdissect_options *, const struct ipxHdr *, const u_char *, u_int); static void ipx_sap_print(netdissect_options *, const u_short *, u_int); static void ipx_rip_print(netdissect_options *, const u_short *, u_int); @@ -96,7 +96,7 @@ trunc: } static const char * -ipxaddr_string(u_int32_t net, const u_char *node) +ipxaddr_string(uint32_t net, const u_char *node) { static char line[256]; -- cgit v1.2.1