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-trmac.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-trmac.c')
| -rw-r--r-- | packet-trmac.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/packet-trmac.c b/packet-trmac.c index a400762a12..1e20bef190 100644 --- a/packet-trmac.c +++ b/packet-trmac.c @@ -2,7 +2,7 @@ * Routines for Token-Ring Media Access Control * Gilbert Ramirez <gram@alumni.rice.edu> * - * $Id: packet-trmac.c,v 1.36 2002/06/02 17:51:00 gerald Exp $ + * $Id: packet-trmac.c,v 1.37 2002/08/02 23:36:04 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 <glib.h> #include <epan/packet.h> @@ -114,7 +110,7 @@ sv_text(tvbuff_t *tvb, int svoff, proto_tree *tree) proto_tree *sv_tree; proto_item *ti; - u_char errors[6]; /* isolating or non-isolating */ + guchar errors[6]; /* isolating or non-isolating */ /* Check the SV length. XXX - Should we do this in each case statement below, e.g. to force |