mirrors
/
cpython
mirror of https://github.com/python/cpython.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Patch #1191065: Fix preprocessor problems on systems where recvfrom 

is a macro.
This commit is contained in:
Martin v. Löwis 2006-04-15 08:35:59 +00:00
parent c90b17ec82
commit 7e75f1aafb
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -48,6 +48,9 @@ Core and builtins
Extension Modules Extension Modules
----------------- -----------------
- Patch #1191065: Fix preprocessor problems on systems where recvfrom
is a macro.
- Bug #1467952: os.listdir() now correctly raises an error if readdir() - Bug #1467952: os.listdir() now correctly raises an error if readdir()
fails with an error condition. fails with an error condition.

14
Modules/socketmodule.c
View File

@ -2208,18 +2208,20 @@ sock_recvfrom(PySocketSockObject *s, PyObject *args)
Py_BEGIN_ALLOW_THREADS Py_BEGIN_ALLOW_THREADS
memset(&addrbuf, 0, addrlen); memset(&addrbuf, 0, addrlen);
timeout = internal_select(s, 0); timeout = internal_select(s, 0);
if (!timeout) if (!timeout) {
n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
#ifndef MS_WINDOWS #ifndef MS_WINDOWS
#if defined(PYOS_OS2) && !defined(PYCC_GCC) #if defined(PYOS_OS2) && !defined(PYCC_GCC)
(struct sockaddr *) &addrbuf, &addrlen n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
(struct sockaddr *) &addrbuf, &addrlen);
#else #else
(void *) &addrbuf, &addrlen n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
(void *) &addrbuf, &addrlen);
#endif #endif
#else #else
(struct sockaddr *) &addrbuf, &addrlen n = recvfrom(s->sock_fd, PyString_AS_STRING(buf), len, flags,
(struct sockaddr *) &addrbuf, &addrlen);
#endif #endif
); }
Py_END_ALLOW_THREADS Py_END_ALLOW_THREADS
if (timeout) { if (timeout) {