diff options
Diffstat (limited to 'epan/inet_aton.c')
| -rw-r--r-- | epan/inet_aton.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/epan/inet_aton.c b/epan/inet_aton.c index f101d10cd1..e2b66d3fe6 100644 --- a/epan/inet_aton.c +++ b/epan/inet_aton.c @@ -43,14 +43,6 @@ static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93"; #include <sys/param.h> #endif -#ifdef HAVE_NETINET_IN_H -#include <netinet/in.h> -#endif - -#ifdef HAVE_WINSOCK2_H -#include <winsock2.h> -#endif - #ifdef HAVE_ARPA_INET_H #include <arpa/inet.h> #endif @@ -71,12 +63,12 @@ inet_aton(cp_arg, addr) const char *cp_arg; struct in_addr *addr; { - register const u_char *cp = cp_arg; - register u_long val; + register const guchar *cp = cp_arg; + register gulong val; register int base, n; - register u_char c; - u_int parts[4]; - register u_int *pp = parts; + register guchar c; + guint parts[4]; + register guint *pp = parts; for (;;) { /* @@ -152,6 +144,6 @@ inet_aton(cp_arg, addr) break; } if (addr) - addr->s_addr = htonl(val); + addr->s_addr = g_htonl(val); return (1); } |