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-isl.c | |
| parent | ff72b97ee01caee4dff97d07195d802086c65f38 (diff) | |
| download | wireshark-173fe5aef4167b9ad35fe514d05ef25fb66c076f.tar.gz wireshark-173fe5aef4167b9ad35fe514d05ef25fb66c076f.tar.bz2 wireshark-173fe5aef4167b9ad35fe514d05ef25fb66c076f.zip | |
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-isl.c')
| -rw-r--r-- | packet-isl.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/packet-isl.c b/packet-isl.c index 5c7e0c6374..d53551c2c6 100644 --- a/packet-isl.c +++ b/packet-isl.c @@ -1,7 +1,7 @@ /* packet-isl.c * Routines for Cisco ISL Ethernet header disassembly * - * $Id: packet-isl.c,v 1.30 2002/01/21 07:36:36 guy Exp $ + * $Id: packet-isl.c,v 1.31 2002/08/02 23:35:52 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,14 +26,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 <glib.h> #include <epan/packet.h> #include "packet-isl.h" @@ -86,7 +78,7 @@ static dissector_handle_t tr_handle; static dissector_handle_t data_handle; void -capture_isl(const u_char *pd, int offset, int len, packet_counts *ld) +capture_isl(const guchar *pd, int offset, int len, packet_counts *ld) { guint8 type; |