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 /prefs.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 'prefs.c')
-rw-r--r-- | prefs.c | 8 |
1 files changed, 2 insertions, 6 deletions
@@ -1,7 +1,7 @@ /* prefs.c * Routines for handling preferences * - * $Id: prefs.c,v 1.87 2002/08/01 03:15:25 jmayer Exp $ + * $Id: prefs.c,v 1.88 2002/08/02 23:36:06 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -26,10 +26,6 @@ # include "config.h" #endif -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> -#endif - #include <stdlib.h> #include <string.h> #include <ctype.h> @@ -1033,7 +1029,7 @@ read_prefs_file(const char *pf_path, FILE *pf) int prefs_set_pref(char *prefarg) { - u_char *p, *colonp; + guchar *p, *colonp; int ret; /* |