Mercurial > cpython-lru_cache-weakref
diff Modules/socketmodule.c @ 57037:c78a00a1d6db 2.6
Merged revisions 69519 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69519 | gregory.p.smith | 2009-02-11 15:45:25 -0800 (Wed, 11 Feb 2009) | 3 lines
Issue #1008086: Fixes socket.inet_aton() to always return 4 bytes even
on LP64 platforms (most 64-bit Linux, bsd, unix systems).
........
| author | Gregory P. Smith <greg@mad-scientist.com> |
|---|---|
| date | Sun, 01 Nov 2009 20:28:48 +0000 |
| parents | 58ba85c0d4b0 |
| children | 7813c40942e9 |
line wrap: on
line diff
--- a/Modules/socketmodule.c Sun Nov 01 20:05:41 2009 +0000 +++ b/Modules/socketmodule.c Sun Nov 01 20:28:48 2009 +0000 @@ -3745,8 +3745,11 @@ #endif #if !defined(HAVE_INET_ATON) || defined(USE_INET_ATON_WEAKLINK) +#if (SIZEOF_INT != 4) +#error "Not sure if in_addr_t exists and int is not 32-bits." +#endif /* Have to use inet_addr() instead */ - unsigned long packed_addr; + unsigned int packed_addr; #endif char *ip_addr; @@ -5284,7 +5287,10 @@ inet_pton(int af, const char *src, void *dst) { if (af == AF_INET) { - long packed_addr; +#if (SIZEOF_INT != 4) +#error "Not sure if in_addr_t exists and int is not 32-bits." +#endif + unsigned int packed_addr; packed_addr = inet_addr(src); if (packed_addr == INADDR_NONE) return 0;