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-tr.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-tr.c')
-rw-r--r-- | packet-tr.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/packet-tr.c b/packet-tr.c index b5f2d40f09..7eaff89c8b 100644 --- a/packet-tr.c +++ b/packet-tr.c @@ -2,7 +2,7 @@ * Routines for Token-Ring packet disassembly * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-tr.c,v 1.71 2002/07/02 08:23:53 guy Exp $ + * $Id: packet-tr.c,v 1.72 2002/08/02 23:36:03 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -27,10 +27,6 @@ # include "config.h" #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - #include <string.h> #include <stdio.h> #include <glib.h> @@ -164,7 +160,7 @@ int check_for_old_linux_tvb(tvbuff_t *tvb) } static -int check_for_old_linux(const u_char * pd) +int check_for_old_linux(const guchar * pd) { int x; for(x=1;x<=18;x++) @@ -182,7 +178,7 @@ static void add_ring_bridge_pairs(int rcf_len, tvbuff_t*, proto_tree *tree); void -capture_tr(const u_char *pd, int offset, int len, packet_counts *ld) { +capture_tr(const guchar *pd, int offset, int len, packet_counts *ld) { int source_routed = 0; int frame_type; |