diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2002-08-02 21:29:45 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2002-08-02 21:29:45 +0000 |
| commit | 3105ee542f89cd986d0f81d2cd70ce385021d1ce (patch) | |
| tree | 8ffc7d7c256c3f3e72a0be7cc31aa2a69cdaed81 /epan/to_str.c | |
| parent | 9630bf353e2ca03bdce5d7ce00f184c898ba40cd (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).
svn path=/trunk/; revision=5928
Diffstat (limited to 'epan/to_str.c')
| -rw-r--r-- | epan/to_str.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/epan/to_str.c b/epan/to_str.c index 6ea8d125b0..1e0cc363e4 100644 --- a/epan/to_str.c +++ b/epan/to_str.c @@ -1,7 +1,7 @@ /* to_str.c * Routines for utilities to convert various other types to strings. * - * $Id: to_str.c,v 1.14 2002/06/23 10:32:32 guy Exp $ + * $Id: to_str.c,v 1.15 2002/08/02 21:29:40 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -29,22 +29,10 @@ #include <stdlib.h> #include <string.h> -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_WINSOCK2_H -# include <winsock2.h> /* for "u_char" */ -#endif - #ifdef NEED_SNPRINTF_H # include "snprintf.h" #endif -#ifdef HAVE_NETINET_IN_H -# include <netinet/in.h> -#endif - #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif @@ -169,7 +157,7 @@ ip6_to_str(struct e_in6_addr *ad) { #endif static gchar buf[INET6_ADDRSTRLEN]; - inet_ntop(AF_INET6, (u_char*)ad, (gchar*)buf, sizeof(buf)); + inet_ntop(AF_INET6, (guchar*)ad, (gchar*)buf, sizeof(buf)); return buf; } |