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-aim.c | |
| parent | ff72b97ee01caee4dff97d07195d802086c65f38 (diff) | |
| download | wireshark-173fe5aef4167b9ad35fe514d05ef25fb66c076f.tar.gz wireshark-173fe5aef4167b9ad35fe514d05ef25fb66c076f.tar.bz2 wireshark-173fe5aef4167b9ad35fe514d05ef25fb66c076f.zip | |
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-aim.c')
| -rw-r--r-- | packet-aim.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/packet-aim.c b/packet-aim.c index 141b64dd58..83991ba44c 100644 --- a/packet-aim.c +++ b/packet-aim.c @@ -2,7 +2,7 @@ * Routines for AIM Instant Messenger (OSCAR) dissection * Copyright 2000, Ralf Hoelzer <ralf@well.com> * - * $Id: packet-aim.c,v 1.15 2002/07/17 00:42:40 guy Exp $ + * $Id: packet-aim.c,v 1.16 2002/08/02 23:35:47 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -32,14 +32,6 @@ #include <string.h> #include <ctype.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif - #include <glib.h> #include <epan/packet.h> @@ -79,7 +71,7 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); -static void get_message( u_char *msg, tvbuff_t *tvb, int msg_offset, int msg_length); +static void get_message( guchar *msg, tvbuff_t *tvb, int msg_offset, int msg_length); static int get_buddyname( char *name, tvbuff_t *tvb, int len_offset, int name_offset); /* Initialize the protocol and registered fields */ @@ -107,7 +99,7 @@ static void dissect_aim(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint16 subtype; guint8 buddyname_length = 0; char buddyname[MAX_BUDDYNAME_LENGTH]; - u_char msg[1000]; + guchar msg[1000]; /* Set up structures we will need to add the protocol subtree and manage it */ proto_item *ti; @@ -486,7 +478,7 @@ static int get_buddyname( char *name, tvbuff_t *tvb, int len_offset, int name_of } -static void get_message( u_char *msg, tvbuff_t *tvb, int msg_offset, int msg_length) +static void get_message( guchar *msg, tvbuff_t *tvb, int msg_offset, int msg_length) { int i,j,c; int bracket = FALSE; |