Mercurial > cpython-lru_cache-weakref
diff Modules/socketmodule.c @ 33427:8480b72aa624 legacy-trunk
Apply patch from http://python.org/sf/728330 to fix socket module compilation on Solaris 2.6, HP-UX 11, AIX 5.1 and (possibly) some IRIX versions.
| author | Trent Mick <trentm@activestate.com> |
|---|---|
| date | Tue, 07 Sep 2004 17:48:26 +0000 |
| parents | 826ad896a7a5 |
| children | 1b3ac674a57c |
line wrap: on
line diff
--- a/Modules/socketmodule.c Tue Sep 07 15:40:12 2004 +0000 +++ b/Modules/socketmodule.c Tue Sep 07 17:48:26 2004 +0000 @@ -257,7 +257,19 @@ # define O_NONBLOCK O_NDELAY #endif -#include "addrinfo.h" +/* include Python's addrinfo.h unless it causes trouble */ +#if defined(__sgi) && _COMPILER_VERSION>700 && defined(_SS_ALIGNSIZE) + /* Do not include addinfo.h on some newer IRIX versions. + * _SS_ALIGNSIZE is defined in sys/socket.h by 6.5.21, + * for example, but not by 6.5.10. + */ +#elif defined(_MSC_VER) && _MSC_VER>1200 + /* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and + * EAI_* constants are defined in (the already included) ws2tcpip.h. + */ +#else +# include "addrinfo.h" +#endif #ifndef HAVE_INET_PTON int inet_pton(int af, const char *src, void *dst);