diff options
| author | Guy Harris <guy@alum.mit.edu> | 2002-10-29 00:28:11 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2002-10-29 00:28:11 +0000 |
| commit | 0b8419fd5b1b6da7be6df44f17ecdb9fbe3c4159 (patch) | |
| tree | cc0b5e965f15f8b9ab0bee112706a945dcebe206 /epan/inet_pton.c | |
| parent | a7744b697f2243613437c8bd1f2bddaeda363b32 (diff) | |
Note why we're including <sys/socket.h> and <winsock2.h> in places where
we're including them to get AF_ values.
Shuffle the order of those includes in "inet_pton.c" to match the order
in "inet_ntop.c".
Include <winsock2.h> in "resolv.c" and "to_str.c" so that we get AF_
values from it - including AF_INET6 - if they exist, as we want to have
everybody who uses AF_INET6 get the same value.
svn path=/trunk/; revision=6517
Diffstat (limited to 'epan/inet_pton.c')
| -rw-r--r-- | epan/inet_pton.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/inet_pton.c b/epan/inet_pton.c index 60a4ff5879..99426e5178 100644 --- a/epan/inet_pton.c +++ b/epan/inet_pton.c @@ -20,7 +20,7 @@ #endif #if defined(LIBC_SCCS) && !defined(lint) -static char rcsid[] = "$Id: inet_pton.c,v 1.4 2002/08/03 19:37:48 guy Exp $"; +static char rcsid[] = "$Id: inet_pton.c,v 1.5 2002/10/29 00:28:10 guy Exp $"; #endif /* LIBC_SCCS and not lint */ #ifdef HAVE_SYS_PARAM_H @@ -31,13 +31,13 @@ static char rcsid[] = "$Id: inet_pton.c,v 1.4 2002/08/03 19:37:48 guy Exp $"; #include <sys/types.h> #endif -#ifdef HAVE_WINSOCK2_H -#include <winsock2.h> -#define EAFNOSUPPORT WSAEAFNOSUPPORT +#ifdef HAVE_SYS_SOCKET_H +#include <sys/socket.h> /* needed to define AF_ values on UNIX */ #endif -#ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> +#ifdef HAVE_WINSOCK2_H +#include <winsock2.h> /* needed to define AF_ values on Windows */ +#define EAFNOSUPPORT WSAEAFNOSUPPORT #endif #ifdef HAVE_NETINET_IN_H |