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/to_str.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/to_str.c')
| -rw-r--r-- | epan/to_str.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/epan/to_str.c b/epan/to_str.c index 7560573a5e..61b414c259 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.17 2002/08/28 20:40:45 jmayer Exp $ + * $Id: to_str.c,v 1.18 2002/10/29 00:28:11 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -46,7 +46,11 @@ #endif #ifdef HAVE_SYS_SOCKET_H -#include <sys/socket.h> +#include <sys/socket.h> /* needed to define AF_ values on UNIX */ +#endif + +#ifdef HAVE_WINSOCK2_H +#include <winsock2.h> /* needed to define AF_ values on Windows */ #endif #ifdef NEED_INET_V6DEFS_H |