mirror of
https://github.com/python/cpython.git
synced 2025-08-19 08:11:46 +00:00
Merged revisions 85665 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85665 | benjamin.peterson | 2010-10-17 16:12:18 -0500 (Sun, 17 Oct 2010) | 1 line fix strict aliasing warnings ........
This commit is contained in:
parent
e2b3bbae4e
commit
a25fc1ef87
1 changed files with 2 additions and 2 deletions
|
@ -122,7 +122,7 @@ multiprocessing_sendfd(PyObject *self, PyObject *args)
|
||||||
cmsg->cmsg_type = SCM_RIGHTS;
|
cmsg->cmsg_type = SCM_RIGHTS;
|
||||||
cmsg->cmsg_len = CMSG_LEN(sizeof(int));
|
cmsg->cmsg_len = CMSG_LEN(sizeof(int));
|
||||||
msg.msg_controllen = cmsg->cmsg_len;
|
msg.msg_controllen = cmsg->cmsg_len;
|
||||||
*(int*)CMSG_DATA(cmsg) = fd;
|
*CMSG_DATA(cmsg) = fd;
|
||||||
|
|
||||||
Py_BEGIN_ALLOW_THREADS
|
Py_BEGIN_ALLOW_THREADS
|
||||||
res = sendmsg(conn, &msg, 0);
|
res = sendmsg(conn, &msg, 0);
|
||||||
|
@ -165,7 +165,7 @@ multiprocessing_recvfd(PyObject *self, PyObject *args)
|
||||||
if (res < 0)
|
if (res < 0)
|
||||||
return PyErr_SetFromErrno(PyExc_OSError);
|
return PyErr_SetFromErrno(PyExc_OSError);
|
||||||
|
|
||||||
fd = *(int*)CMSG_DATA(cmsg);
|
fd = *CMSG_DATA(cmsg);
|
||||||
return Py_BuildValue("i", fd);
|
return Py_BuildValue("i", fd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue