diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-08-02 21:29:45 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-08-02 21:29:45 +0000 |
| commit | bbfe7a43adac77429ac8d72873ef3181f9b51514 (patch) | |
| tree | 8ffc7d7c256c3f3e72a0be7cc31aa2a69cdaed81 /epan/strutil.h | |
| parent | d84a55c64e962e94abaa7808887842093baba2ad (diff) | |
Replace the types from sys/types.h and netinet/in.h by their glib.h
equivalents for the epan/ directory but leave winsock2.h in inet_pton.c
and inet_ntop.c for now (can't estimate the consequences).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@5928 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/strutil.h')
| -rw-r--r-- | epan/strutil.h | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/epan/strutil.h b/epan/strutil.h index f334cb7dd4..2201c9d6a4 100644 --- a/epan/strutil.h +++ b/epan/strutil.h @@ -1,7 +1,7 @@ /* strutil.h * String utility definitions * - * $Id: strutil.h,v 1.7 2002/06/23 10:32:32 guy Exp $ + * $Id: strutil.h,v 1.8 2002/08/02 21:29:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -27,19 +27,11 @@ /* ... thus, config.h needs to be #included */ -#ifdef HAVE_SYS_TYPES_H -#include <sys/types.h> /* for u_char */ -#endif - -#ifdef HAVE_WINSOCK2_H -# include <winsock2.h> /* for u_char */ -#endif - -const u_char *find_line_end(const u_char *data, const u_char *dataend, - const u_char **eol); -int get_token_len(const u_char *linep, const u_char *lineend, - const u_char **next_token); -gchar* format_text(const u_char *line, int len); +const guchar *find_line_end(const guchar *data, const guchar *dataend, + const guchar **eol); +int get_token_len(const guchar *linep, const guchar *lineend, + const guchar **next_token); +gchar* format_text(const guchar *line, int len); gchar* bytes_to_str(const guint8 *, int); gchar* bytes_to_str_punct(const guint8 *, int, gchar punct); #endif /* __STRUTIL_H__ */ |