From 173fe5aef4167b9ad35fe514d05ef25fb66c076f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Mayer?= <jmayer@loplof.de>
Date: Fri, 2 Aug 2002 23:36:07 +0000
Subject: 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
---
 packet-nbns.c | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

(limited to 'packet-nbns.c')

diff --git a/packet-nbns.c b/packet-nbns.c
index bf8406554b..717e26346e 100644
--- a/packet-nbns.c
+++ b/packet-nbns.c
@@ -3,7 +3,7 @@
  * to when it had only NBNS)
  * Guy Harris <guy@alum.mit.edu>
  *
- * $Id: packet-nbns.c,v 1.76 2002/05/15 07:24:20 guy Exp $
+ * $Id: packet-nbns.c,v 1.77 2002/08/02 23:35:54 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -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>
@@ -429,7 +425,7 @@ dissect_nbns_query(tvbuff_t *tvb, int offset, int nbns_data_offset,
 
 static void
 nbns_add_nbns_flags(proto_tree *nbns_tree, tvbuff_t *tvb, int offset,
-    u_short flags, int is_wack)
+    gushort flags, int is_wack)
 {
 	char buf[128+1];
 	guint16 opcode;
@@ -472,7 +468,7 @@ nbns_add_nbns_flags(proto_tree *nbns_tree, tvbuff_t *tvb, int offset,
 }
 
 static void
-nbns_add_nb_flags(proto_tree *rr_tree, tvbuff_t *tvb, int offset, u_short flags)
+nbns_add_nb_flags(proto_tree *rr_tree, tvbuff_t *tvb, int offset, gushort flags)
 {
 	char buf[128+1];
 	proto_tree *field_tree;
@@ -507,7 +503,7 @@ nbns_add_nb_flags(proto_tree *rr_tree, tvbuff_t *tvb, int offset, u_short flags)
 
 static void
 nbns_add_name_flags(proto_tree *rr_tree, tvbuff_t *tvb, int offset,
-    u_short flags)
+    gushort flags)
 {
 	char buf[128+1];
 	proto_item *field_tree;
@@ -582,15 +578,15 @@ dissect_nbns_answer(tvbuff_t *tvb, int offset, int nbns_data_offset,
 	int data_offset;
 	int cur_offset;
 	int data_start;
-	u_int ttl;
-	u_short data_len;
-	u_short flags;
+	guint ttl;
+	gushort data_len;
+	gushort flags;
 	proto_tree *rr_tree;
 	proto_item *trr;
 	char name_str[(NETBIOS_NAME_LEN - 1)*4 + 1];
-	u_int num_names;
+	guint num_names;
 	char nbname[16+4+1];	/* 4 for [<last char>] */
-	u_short name_flags;
+	gushort name_flags;
 
 	data_start = data_offset = offset;
 	cur_offset = offset;
-- 
cgit v1.2.3