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

1 files changed, 2 insertions, 6 deletions

diff --git a/xdlc.c b/xdlc.c
index 46152833b6..00383ad05a 100644
--- a/xdlc.c
+++ b/xdlc.c
@@ -2,7 +2,7 @@
  * Routines for use by various SDLC-derived protocols, such as HDLC
  * and its derivatives LAPB, IEEE 802.2 LLC, etc..
  *
- * $Id: xdlc.c,v 1.18 2002/03/31 21:09:00 guy Exp $
+ * $Id: xdlc.c,v 1.19 2002/08/02 23:36:07 jmayer Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -27,10 +27,6 @@
 # include "config.h"
 #endif
 
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
 #include <stdio.h>
 #include <string.h>
 
@@ -159,7 +155,7 @@ static const value_string modifier_vals_resp[] = {
 };
 
 int
-get_xdlc_control(const u_char *pd, int offset, int is_extended)
+get_xdlc_control(const guchar *pd, int offset, int is_extended)
 {
     guint16 control;