cuberite/libevent
1
0
Fork 0
mirror of https://github.com/cuberite/libevent.git synced 2025-09-10 04:50:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Do not use system EAI/AI values if we are not using the system getaddrinfo.

Browse Source
This commit is contained in:
Nick Mathewson 2012-02-28 14:32:01 -05:00
parent 92385a9f3c
commit 7bcac07d5a
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/event2/util.h
View File

@ -549,32 +549,32 @@ struct evutil_addrinfo {
@{ @{
*/ */
#ifdef EAI_ADDRFAMILY #if defined(EAI_ADDRFAMILY) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_EAI_ADDRFAMILY EAI_ADDRFAMILY #define EVUTIL_EAI_ADDRFAMILY EAI_ADDRFAMILY
#else #else
#define EVUTIL_EAI_ADDRFAMILY -901 #define EVUTIL_EAI_ADDRFAMILY -901
#endif #endif
#ifdef EAI_AGAIN #if defined(EAI_AGAIN) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_EAI_AGAIN EAI_AGAIN #define EVUTIL_EAI_AGAIN EAI_AGAIN
#else #else
#define EVUTIL_EAI_AGAIN -902 #define EVUTIL_EAI_AGAIN -902
#endif #endif
#ifdef EAI_BADFLAGS #if defined(EAI_BADFLAGS) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_EAI_BADFLAGS EAI_BADFLAGS #define EVUTIL_EAI_BADFLAGS EAI_BADFLAGS
#else #else
#define EVUTIL_EAI_BADFLAGS -903 #define EVUTIL_EAI_BADFLAGS -903
#endif #endif
#ifdef EAI_FAIL #if defined(EAI_FAIL) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_EAI_FAIL EAI_FAIL #define EVUTIL_EAI_FAIL EAI_FAIL
#else #else
#define EVUTIL_EAI_FAIL -904 #define EVUTIL_EAI_FAIL -904
#endif #endif
#ifdef EAI_FAMILY #if defined(EAI_FAMILY) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_EAI_FAMILY EAI_FAMILY #define EVUTIL_EAI_FAMILY EAI_FAMILY
#else #else
#define EVUTIL_EAI_FAMILY -905 #define EVUTIL_EAI_FAMILY -905
#endif #endif
#ifdef EAI_MEMORY #if defined(EAI_MEMORY) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_EAI_MEMORY EAI_MEMORY #define EVUTIL_EAI_MEMORY EAI_MEMORY
#else #else
#define EVUTIL_EAI_MEMORY -906 #define EVUTIL_EAI_MEMORY -906
@ -582,27 +582,27 @@ struct evutil_addrinfo {
/* This test is a bit complicated, since some MS SDKs decide to /* This test is a bit complicated, since some MS SDKs decide to
* remove NODATA or redefine it to be the same as NONAME, in a * remove NODATA or redefine it to be the same as NONAME, in a
* fun interpretation of RFC 2553 and RFC 3493. */ * fun interpretation of RFC 2553 and RFC 3493. */
#if defined(EAI_NODATA) && (!defined(EAI_NONAME) || EAI_NODATA != EAI_NONAME) #if defined(EAI_NODATA) && defined(_EVENT_HAVE_GETADDRINFO) && (!defined(EAI_NONAME) || EAI_NODATA != EAI_NONAME)
#define EVUTIL_EAI_NODATA EAI_NODATA #define EVUTIL_EAI_NODATA EAI_NODATA
#else #else
#define EVUTIL_EAI_NODATA -907 #define EVUTIL_EAI_NODATA -907
#endif #endif
#ifdef EAI_NONAME #if defined(EAI_NONAME) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_EAI_NONAME EAI_NONAME #define EVUTIL_EAI_NONAME EAI_NONAME
#else #else
#define EVUTIL_EAI_NONAME -908 #define EVUTIL_EAI_NONAME -908
#endif #endif
#ifdef EAI_SERVICE #if defined(EAI_SERVICE) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_EAI_SERVICE EAI_SERVICE #define EVUTIL_EAI_SERVICE EAI_SERVICE
#else #else
#define EVUTIL_EAI_SERVICE -909 #define EVUTIL_EAI_SERVICE -909
#endif #endif
#ifdef EAI_SOCKTYPE #if defined(EAI_SOCKTYPE) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_EAI_SOCKTYPE EAI_SOCKTYPE #define EVUTIL_EAI_SOCKTYPE EAI_SOCKTYPE
#else #else
#define EVUTIL_EAI_SOCKTYPE -910 #define EVUTIL_EAI_SOCKTYPE -910
#endif #endif
#ifdef EAI_SYSTEM #if defined(EAI_SYSTEM) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_EAI_SYSTEM EAI_SYSTEM #define EVUTIL_EAI_SYSTEM EAI_SYSTEM
#else #else
#define EVUTIL_EAI_SYSTEM -911 #define EVUTIL_EAI_SYSTEM -911
@ -610,37 +610,37 @@ struct evutil_addrinfo {
#define EVUTIL_EAI_CANCEL -90001 #define EVUTIL_EAI_CANCEL -90001
#ifdef AI_PASSIVE #if defined(AI_PASSIVE) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_AI_PASSIVE AI_PASSIVE #define EVUTIL_AI_PASSIVE AI_PASSIVE
#else #else
#define EVUTIL_AI_PASSIVE 0x1000 #define EVUTIL_AI_PASSIVE 0x1000
#endif #endif
#ifdef AI_CANONNAME #if defined(AI_CANONNAME) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_AI_CANONNAME AI_CANONNAME #define EVUTIL_AI_CANONNAME AI_CANONNAME
#else #else
#define EVUTIL_AI_CANONNAME 0x2000 #define EVUTIL_AI_CANONNAME 0x2000
#endif #endif
#ifdef AI_NUMERICHOST #if defined(AI_NUMERICHOST) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_AI_NUMERICHOST AI_NUMERICHOST #define EVUTIL_AI_NUMERICHOST AI_NUMERICHOST
#else #else
#define EVUTIL_AI_NUMERICHOST 0x4000 #define EVUTIL_AI_NUMERICHOST 0x4000
#endif #endif
#ifdef AI_NUMERICSERV #if defined(AI_NUMERICSERV) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_AI_NUMERICSERV AI_NUMERICSERV #define EVUTIL_AI_NUMERICSERV AI_NUMERICSERV
#else #else
#define EVUTIL_AI_NUMERICSERV 0x8000 #define EVUTIL_AI_NUMERICSERV 0x8000
#endif #endif
#ifdef AI_V4MAPPED #if defined(AI_V4MAPPED) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_AI_V4MAPPED AI_V4MAPPED #define EVUTIL_AI_V4MAPPED AI_V4MAPPED
#else #else
#define EVUTIL_AI_V4MAPPED 0x10000 #define EVUTIL_AI_V4MAPPED 0x10000
#endif #endif
#ifdef AI_ALL #if defined(AI_ALL) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_AI_ALL AI_ALL #define EVUTIL_AI_ALL AI_ALL
#else #else
#define EVUTIL_AI_ALL 0x20000 #define EVUTIL_AI_ALL 0x20000
#endif #endif
#ifdef AI_ADDRCONFIG #if defined(AI_ADDRCONFIG) && defined(_EVENT_HAVE_GETADDRINFO)
#define EVUTIL_AI_ADDRCONFIG AI_ADDRCONFIG #define EVUTIL_AI_ADDRCONFIG AI_ADDRCONFIG
#else #else
#define EVUTIL_AI_ADDRCONFIG 0x40000 #define EVUTIL_AI_ADDRCONFIG 0x40000