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-esis.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-esis.c')
| -rw-r--r-- | packet-esis.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/packet-esis.c b/packet-esis.c index 56664a72bb..f1d2c9133f 100644 --- a/packet-esis.c +++ b/packet-esis.c @@ -2,7 +2,7 @@ * Routines for ISO/OSI End System to Intermediate System * Routing Exchange Protocol ISO 9542. * - * $Id: packet-esis.c,v 1.25 2002/04/30 23:56:58 guy Exp $ + * $Id: packet-esis.c,v 1.26 2002/08/02 23:35:49 jmayer Exp $ * Ralf Schneider <Ralf.Schneider@t-online.de> * * Ethereal - Network traffic analyzer @@ -28,10 +28,6 @@ # include "config.h" #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - #include <stdio.h> #include <string.h> #include <glib.h> @@ -64,11 +60,11 @@ static const value_string esis_vals[] = { /* internal prototypes */ -static void esis_dissect_esh_pdu( u_char len, tvbuff_t *tvb, +static void esis_dissect_esh_pdu( guchar len, tvbuff_t *tvb, proto_tree *treepd); -static void esis_dissect_ish_pdu( u_char len, tvbuff_t *tvb, +static void esis_dissect_ish_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree); -static void esis_dissect_redirect_pdu( u_char len, tvbuff_t *tvb, +static void esis_dissect_redirect_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree); /* ################## Descriptions ###########################################*/ @@ -153,7 +149,7 @@ esis_dissect_unknown( tvbuff_t *tvb, proto_tree *tree, char *fmat, ...){ static void -esis_dissect_esh_pdu( u_char len, tvbuff_t *tvb, proto_tree *tree) { +esis_dissect_esh_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { proto_tree *esis_area_tree; int offset = 0; int no_sa = 0; @@ -187,7 +183,7 @@ esis_dissect_esh_pdu( u_char len, tvbuff_t *tvb, proto_tree *tree) { } /* esis_dissect_esh_pdu */ ; static void -esis_dissect_ish_pdu( u_char len, tvbuff_t *tvb, proto_tree *tree) { +esis_dissect_ish_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { int offset = 0; int netl = 0; @@ -210,7 +206,7 @@ esis_dissect_ish_pdu( u_char len, tvbuff_t *tvb, proto_tree *tree) { }; static void -esis_dissect_redirect_pdu( u_char len, tvbuff_t *tvb, proto_tree *tree) { +esis_dissect_redirect_pdu( guchar len, tvbuff_t *tvb, proto_tree *tree) { int offset = 0; int tmpl = 0; @@ -283,7 +279,7 @@ dissect_esis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { proto_item *ti; proto_tree *esis_tree = NULL; int variable_len = 0; - u_int tmp_uint = 0; + guint tmp_uint = 0; char *cksum_status; if (check_col(pinfo->cinfo, COL_PROTOCOL)) |