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-socks.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-socks.c')
-rw-r--r-- | packet-socks.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/packet-socks.c b/packet-socks.c index f8e6099488..a623c06b1a 100644 --- a/packet-socks.c +++ b/packet-socks.c @@ -2,7 +2,7 @@ * Routines for socks versions 4 &5 packet dissection * Copyright 2000, Jeffrey C. Foster <jfoste@woodward.com> * - * $Id: packet-socks.c,v 1.41 2002/07/17 00:42:42 guy Exp $ + * $Id: packet-socks.c,v 1.42 2002/08/02 23:36:03 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -55,14 +55,6 @@ #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif - #include <stdio.h> #include <string.h> #include <glib.h> @@ -882,8 +874,8 @@ display_ping_and_tracert(tvbuff_t *tvb, int offset, packet_info *pinfo, proto_tr /* Display the ping/trace_route conversation */ - const u_char *data, *dataend; - const u_char *lineend, *eol; + const guchar *data, *dataend; + const guchar *lineend, *eol; int linelen; /* handle the end command */ |