diff options
author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-08-02 23:36:07 +0000 |
---|---|---|
committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-08-02 23:36:07 +0000 |
commit | 4ad4caac3465466d917054d2f911b18ba27b4fe0 (patch) | |
tree | 21967e4c27ac5e02aa39319022dd2858682fc5f4 /packet-prism.c | |
parent | 14e1dba11b93d23bda70c030b0f4dbcc8ea5c4a4 (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.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5932 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-prism.c')
-rw-r--r-- | packet-prism.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/packet-prism.c b/packet-prism.c index 0de8b4e8ca..ece8002dd8 100644 --- a/packet-prism.c +++ b/packet-prism.c @@ -9,7 +9,7 @@ * * By Tim Newsham * - * $Id: packet-prism.c,v 1.6 2002/01/21 07:36:38 guy Exp $ + * $Id: packet-prism.c,v 1.7 2002/08/02 23:35:56 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -36,10 +36,6 @@ # include "config.h" #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - #include <glib.h> #include <epan/packet.h> @@ -86,7 +82,7 @@ static gint ett_prism = -1; static dissector_handle_t ieee80211_handle; void -capture_prism(const u_char *pd, int offset, int len, packet_counts *ld) +capture_prism(const guchar *pd, int offset, int len, packet_counts *ld) { if(!BYTES_ARE_IN_FRAME(offset, len, (int)sizeof(struct prism_hdr))) { ld->other ++; |