diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2002-08-02 23:36:07 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2002-08-02 23:36:07 +0000 |
| commit | 173fe5aef4167b9ad35fe514d05ef25fb66c076f (patch) | |
| tree | 21967e4c27ac5e02aa39319022dd2858682fc5f4 /packet-vrrp.c | |
| parent | ff72b97ee01caee4dff97d07195d802086c65f38 (diff) | |
Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the toplevel directory. The removal of winsock2.h will
hopefully not cause any problems under MSVC++, as those files using
struct timeval still include wtap.h, which still includes winsock2.h.
svn path=/trunk/; revision=5932
Diffstat (limited to 'packet-vrrp.c')
| -rw-r--r-- | packet-vrrp.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/packet-vrrp.c b/packet-vrrp.c index e57c131b60..1b500dca04 100644 --- a/packet-vrrp.c +++ b/packet-vrrp.c @@ -4,7 +4,7 @@ * * Heikki Vatiainen <hessu@cs.tut.fi> * - * $Id: packet-vrrp.c,v 1.23 2002/03/28 07:40:54 itojun Exp $ + * $Id: packet-vrrp.c,v 1.24 2002/08/02 23:36:04 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -29,14 +29,6 @@ # include "config.h" #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif - #include <string.h> #include <glib.h> #include <epan/packet.h> @@ -175,8 +167,8 @@ dissect_vrrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) cksum_vec[1].ptr = pinfo->dst.data; cksum_vec[1].len = pinfo->dst.len; cksum_vec[2].ptr = (const guint8 *)&phdr; - phdr[0] = htonl(vrrp_len); - phdr[1] = htonl(IP_PROTO_VRRP); + phdr[0] = g_htonl(vrrp_len); + phdr[1] = g_htonl(IP_PROTO_VRRP); cksum_vec[2].len = 8; cksum_vec[3].ptr = tvb_get_ptr(tvb, 0, vrrp_len); cksum_vec[3].len = vrrp_len; |