diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-10-17 21:17:38 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-10-17 21:17:38 (GMT) |
| commit | a25fc1ef8729231f70eb65084381b88a47228eaa (patch) | |
| tree | e110dc34bcb41c955c4242f0b80dcfdcecf58fb2 | |
| parent | e2b3bbae4e718b02d0852cfbc50c34b37890eac8 (diff) | |
| download | cpython-a25fc1ef8729231f70eb65084381b88a47228eaa.zip cpython-a25fc1ef8729231f70eb65084381b88a47228eaa.tar.gz cpython-a25fc1ef8729231f70eb65084381b88a47228eaa.tar.bz2 | |
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
........
| -rw-r--r-- | Modules/_multiprocessing/multiprocessing.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_multiprocessing/multiprocessing.c b/Modules/_multiprocessing/multiprocessing.c index 31bc803..93f1c48 100644 --- a/Modules/_multiprocessing/multiprocessing.c +++ b/Modules/_multiprocessing/multiprocessing.c @@ -122,7 +122,7 @@ multiprocessing_sendfd(PyObject *self, PyObject *args) cmsg->cmsg_type = SCM_RIGHTS; cmsg->cmsg_len = CMSG_LEN(sizeof(int)); msg.msg_controllen = cmsg->cmsg_len; - *(int*)CMSG_DATA(cmsg) = fd; + *CMSG_DATA(cmsg) = fd; Py_BEGIN_ALLOW_THREADS res = sendmsg(conn, &msg, 0); @@ -165,7 +165,7 @@ multiprocessing_recvfd(PyObject *self, PyObject *args) if (res < 0) return PyErr_SetFromErrno(PyExc_OSError); - fd = *(int*)CMSG_DATA(cmsg); + fd = *CMSG_DATA(cmsg); return Py_BuildValue("i", fd); } |