mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-15 22:30:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merged revisions 69519 via svnmerge from

Browse source 
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).
........
This commit is contained in:
Gregory P. Smith 2009-11-01 20:28:48 +00:00
parent 743d8319ef
commit 63e64add92
3 changed files with 19 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Modules/socketmodule.c
View file

@ -3745,8 +3745,11 @@ socket_inet_aton(PyObject *self, PyObject *args)
#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 @@ int
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;