diff options
| author | Yang Tse <yangsita@gmail.com> | 2007-10-24 14:39:07 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2007-10-24 14:39:07 +0000 |
| commit | 08c5e2a194876be4db31536ac0211695c12aa266 (patch) | |
| tree | 4946697d72b5a80200d2d41c02b84e752cb96799 /ares | |
| parent | c67c54d4b3d981bd1763a6f64fe5804c390a74f9 (diff) | |
Windows build targets have socklen_t definition in ws2tcpip.h but some
versions of ws2tcpip.h do not have the definition. It seems that when
the socklen_t definition is missing from ws2tcpip.h the definition for
INET_ADDRSTRLEN is also missing, and that when one definition is present
the other one also is available.
Diffstat (limited to 'ares')
| -rw-r--r-- | ares/config-win32.h | 5 | ||||
| -rw-r--r-- | ares/setup.h | 4 | ||||
| -rw-r--r-- | ares/setup_once.h | 18 |
3 files changed, 18 insertions, 9 deletions
diff --git a/ares/config-win32.h b/ares/config-win32.h index a44563204..94ffe5389 100644 --- a/ares/config-win32.h +++ b/ares/config-win32.h @@ -146,11 +146,6 @@ #define ssize_t int #endif -/* Define to 'int' if socklen_t is not an available 'typedefed' type */ -#ifndef HAVE_WS2TCPIP_H -#define socklen_t int -#endif - /* ---------------------------------------------------------------- */ /* STRUCT RELATED */ /* ---------------------------------------------------------------- */ diff --git a/ares/setup.h b/ares/setup.h index a20b8f1b7..29e5d0f1f 100644 --- a/ares/setup.h +++ b/ares/setup.h @@ -97,10 +97,6 @@ #define ssize_t int #endif -#ifndef HAVE_WS2TCPIP_H -#define socklen_t int -#endif - #endif /* HAVE_CONFIG_H */ /* diff --git a/ares/setup_once.h b/ares/setup_once.h index d9b0f86ea..20969d448 100644 --- a/ares/setup_once.h +++ b/ares/setup_once.h @@ -91,6 +91,24 @@ struct timeval { #endif +/* + * Windows build targets have socklen_t definition in + * ws2tcpip.h but some versions of ws2tcpip.h do not + * have the definition. It seems that when the socklen_t + * definition is missing from ws2tcpip.h the definition + * for INET_ADDRSTRLEN is also missing, and that when one + * definition is present the other one also is available. + */ + +#if defined(WIN32) && !defined(HAVE_SOCKLEN_T) +# if ( defined(_MSC_VER) && !defined(INET_ADDRSTRLEN) ) || \ + (!defined(_MSC_VER) && !defined(HAVE_WS2TCPIP_H) ) +# define socklen_t int +# define HAVE_SOCKLEN_T +# endif +#endif + + #if defined(__minix) /* Minix doesn't support recv on TCP sockets */ #define sread(x,y,z) (ssize_t)read((RECV_TYPE_ARG1)(x), \ |