diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2001-12-06 19:04:35 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2001-12-06 19:04:35 (GMT) |
| commit | a631f580ea4bb9670263f701f41589ab7d591d6f (patch) | |
| tree | 72db2a90befa5b178b0be36189d292e97bba9ea5 | |
| parent | 2998a55f2dd658d15d033272ac88aebfc0dda957 (diff) | |
| download | cpython-a631f580ea4bb9670263f701f41589ab7d591d6f.zip cpython-a631f580ea4bb9670263f701f41589ab7d591d6f.tar.gz cpython-a631f580ea4bb9670263f701f41589ab7d591d6f.tar.bz2 | |
Undefine addrinfo.h constants if the system header defined them.
Fixes #486099.
| -rw-r--r-- | Modules/addrinfo.h | 39 |
1 files changed, 35 insertions, 4 deletions
diff --git a/Modules/addrinfo.h b/Modules/addrinfo.h index 686a4b8..7f85d81 100644 --- a/Modules/addrinfo.h +++ b/Modules/addrinfo.h @@ -32,7 +32,29 @@ /* * Error return codes from getaddrinfo() */ -#ifndef EAI_ADDRFAMILY +#ifdef EAI_ADDRFAMILY +/* If this is defined, there is a conflicting implementation + in the C library, which can't be used for some reason. + Make sure it won't interfere with this emulation. */ + +#undef EAI_ADDRFAMILY +#undef EAI_AGAIN +#undef EAI_BADFLAGS +#undef EAI_FAIL +#undef EAI_FAMILY +#undef EAI_MEMORY +#undef EAI_NODATA +#undef EAI_NONAME +#undef EAI_SERVICE +#undef EAI_SOCKTYPE +#undef EAI_SYSTEM +#undef EAI_BADHINTS +#undef EAI_PROTOCOL +#undef EAI_MAX +#undef getaddrinfo +#define getaddrinfo fake_getaddrinfo +#endif + #define EAI_ADDRFAMILY 1 /* address family for hostname not supported */ #define EAI_AGAIN 2 /* temporary failure in name resolution */ #define EAI_BADFLAGS 3 /* invalid value for ai_flags */ @@ -47,12 +69,22 @@ #define EAI_BADHINTS 12 #define EAI_PROTOCOL 13 #define EAI_MAX 14 -#endif /* * Flag values for getaddrinfo() */ -#ifndef AI_PASSIVE +#ifdef AI_PASSIVE +#undef AI_PASSIVE +#undef AI_CANONNAME +#undef AI_NUMERICHOST +#undef AI_MASK +#undef AI_ALL +#undef AI_V4MAPPED_CFG +#undef AI_ADDRCONFIG +#undef AI_V4MAPPED +#undef AI_DEFAULT +#endif + #define AI_PASSIVE 0x00000001 /* get address to use bind() */ #define AI_CANONNAME 0x00000002 /* fill ai_canonname */ #define AI_NUMERICHOST 0x00000004 /* prevent name resolution */ @@ -65,7 +97,6 @@ #define AI_V4MAPPED 0x00000800 /* accept IPv4-mapped IPv6 address */ /* special recommended flags for getipnodebyname */ #define AI_DEFAULT (AI_V4MAPPED_CFG | AI_ADDRCONFIG) -#endif #endif /* HAVE_GETADDRINFO */ |