diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2002-08-04 00:45:59 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2002-08-04 00:45:59 +0000 |
| commit | 48aa93c9ee40f33234314bcf83bab7a6a6fd3a94 (patch) | |
| tree | 4191d6521550d2893370e516e12e272a37896b13 /epan/inet_aton.c | |
| parent | 183929aad4c9bf6b20714c9e25ee563e31217edf (diff) | |
Undo my last change: These files are used by systems only that need sys/types.h
anyway (see Guys remark on inet_pton.c).
svn path=/trunk/; revision=5947
Diffstat (limited to 'epan/inet_aton.c')
| -rw-r--r-- | epan/inet_aton.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/epan/inet_aton.c b/epan/inet_aton.c index e2b66d3fe6..f101d10cd1 100644 --- a/epan/inet_aton.c +++ b/epan/inet_aton.c @@ -43,6 +43,14 @@ 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 @@ -63,12 +71,12 @@ inet_aton(cp_arg, addr) const char *cp_arg; struct in_addr *addr; { - register const guchar *cp = cp_arg; - register gulong val; + register const u_char *cp = cp_arg; + register u_long val; register int base, n; - register guchar c; - guint parts[4]; - register guint *pp = parts; + register u_char c; + u_int parts[4]; + register u_int *pp = parts; for (;;) { /* @@ -144,6 +152,6 @@ inet_aton(cp_arg, addr) break; } if (addr) - addr->s_addr = g_htonl(val); + addr->s_addr = htonl(val); return (1); } |