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-netbios.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-netbios.c')
| -rw-r--r-- | packet-netbios.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/packet-netbios.c b/packet-netbios.c index 22b6ee9024..bf39a48fe4 100644 --- a/packet-netbios.c +++ b/packet-netbios.c @@ -5,7 +5,7 @@ * * derived from the packet-nbns.c * - * $Id: packet-netbios.c,v 1.49 2002/07/22 20:52:21 tpot Exp $ + * $Id: packet-netbios.c,v 1.50 2002/08/02 23:35:55 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,10 +30,6 @@ # include "config.h" #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - #include <stdio.h> #include <string.h> #include <glib.h> @@ -254,11 +250,11 @@ void capture_netbios(packet_counts *ld) int -process_netbios_name(const u_char *name_ptr, char *name_ret) +process_netbios_name(const guchar *name_ptr, char *name_ret) { int i; int name_type = *(name_ptr + NETBIOS_NAME_LEN - 1); - u_char name_char; + guchar name_char; static const char hex_digits[16] = "0123456789abcdef"; for (i = 0; i < NETBIOS_NAME_LEN - 1; i++) { @@ -627,7 +623,7 @@ static void dissect_netb_terminate_trace( tvbuff_t *tvb _U_, int offset _U_, } -static u_char zeroes[10]; +static guchar zeroes[10]; static void dissect_netb_datagram( tvbuff_t *tvb, int offset, proto_tree *tree) |