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-atm.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-atm.c')
| -rw-r--r-- | packet-atm.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/packet-atm.c b/packet-atm.c index 889264aa2f..88cd16095b 100644 --- a/packet-atm.c +++ b/packet-atm.c @@ -1,7 +1,7 @@ /* packet-atm.c * Routines for ATM packet disassembly * - * $Id: packet-atm.c,v 1.47 2002/06/07 21:11:22 guy Exp $ + * $Id: packet-atm.c,v 1.48 2002/08/02 23:35:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,10 +26,6 @@ # include "config.h" #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - #include <stdio.h> #include <glib.h> #include <epan/packet.h> @@ -617,7 +613,7 @@ dissect_le_control(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } static void -capture_lane(const union wtap_pseudo_header *pseudo_header, const u_char *pd, +capture_lane(const union wtap_pseudo_header *pseudo_header, const guchar *pd, int len, packet_counts *ld) { /* Is it LE Control, 802.3, 802.5, or "none of the above"? */ @@ -760,7 +756,7 @@ static const value_string ipsilon_type_vals[] = { }; void -capture_atm(const union wtap_pseudo_header *pseudo_header, const u_char *pd, +capture_atm(const union wtap_pseudo_header *pseudo_header, const guchar *pd, int len, packet_counts *ld) { if (pseudo_header->atm.aal == AAL_5) { |