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-ieee80211.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-ieee80211.c')
| -rw-r--r-- | packet-ieee80211.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/packet-ieee80211.c b/packet-ieee80211.c index a73d0186fe..49a6be410d 100644 --- a/packet-ieee80211.c +++ b/packet-ieee80211.c @@ -3,7 +3,7 @@ * Copyright 2000, Axis Communications AB * Inquiries/bugreports should be sent to Johan.Jorgensen@axis.com * - * $Id: packet-ieee80211.c,v 1.72 2002/07/31 09:00:02 guy Exp $ + * $Id: packet-ieee80211.c,v 1.73 2002/08/02 23:35:50 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -41,14 +41,6 @@ #include <stdio.h> #include <stdlib.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif - #ifdef NEED_SNPRINTF_H # include "snprintf.h" #endif @@ -449,7 +441,7 @@ find_header_length (guint16 fcf) /* This is the capture function used to update packet counts */ /* ************************************************************************* */ static void -capture_ieee80211_common (const u_char * pd, int offset, int len, +capture_ieee80211_common (const guchar * pd, int offset, int len, packet_counts * ld, gboolean fixed_length_header) { guint16 fcf, hdr_length; @@ -511,7 +503,7 @@ capture_ieee80211_common (const u_char * pd, int offset, int len, * Handle 802.11 with a variable-length link-layer header. */ void -capture_ieee80211 (const u_char * pd, int offset, int len, packet_counts * ld) +capture_ieee80211 (const guchar * pd, int offset, int len, packet_counts * ld) { capture_ieee80211_common (pd, offset, len, ld, FALSE); } @@ -521,7 +513,7 @@ capture_ieee80211 (const u_char * pd, int offset, int len, packet_counts * ld) * maximum length). */ void -capture_ieee80211_fixed (const u_char * pd, int offset, int len, packet_counts * ld) +capture_ieee80211_fixed (const guchar * pd, int offset, int len, packet_counts * ld) { capture_ieee80211_common (pd, offset, len, ld, TRUE); } |