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/resolv.c | |
| parent | 9630bf353e2ca03bdce5d7ce00f184c898ba40cd (diff) | |
| download | wireshark-3105ee542f89cd986d0f81d2cd70ce385021d1ce.tar.gz wireshark-3105ee542f89cd986d0f81d2cd70ce385021d1ce.tar.bz2 wireshark-3105ee542f89cd986d0f81d2cd70ce385021d1ce.zip | |
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/resolv.c')
| -rw-r--r-- | epan/resolv.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/epan/resolv.c b/epan/resolv.c index 9d51666cc5..7c8128918d 100644 --- a/epan/resolv.c +++ b/epan/resolv.c @@ -1,7 +1,7 @@ /* resolv.c * Routines for network object lookup * - * $Id: resolv.c,v 1.23 2002/03/03 21:42:54 guy Exp $ + * $Id: resolv.c,v 1.24 2002/08/02 21:29:40 jmayer Exp $ * * Laurent Deniel <deniel@worldnet.fr> * @@ -42,10 +42,6 @@ #include <unistd.h> #endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - #ifdef HAVE_NETINET_IN_H # include <netinet/in.h> #endif @@ -234,7 +230,7 @@ static guchar *serv_name_lookup(guint port, port_type proto) tp->next = NULL; if (!(g_resolv_flags & RESOLV_TRANSPORT) || - (servp = getservbyport(htons(port), serv_proto)) == NULL) { + (servp = getservbyport(g_htons(port), serv_proto)) == NULL) { /* unknown port */ sprintf(tp->name, "%d", port); } else { @@ -1407,7 +1403,7 @@ gboolean get_host_ipaddr(const char *host, guint32 *addrp) return FALSE; } - *addrp = ntohl(ipaddr.s_addr); + *addrp = g_ntohl(ipaddr.s_addr); return TRUE; } |