diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2011-08-23 19:49:43 +0200 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2011-08-23 19:49:43 +0200 |
| commit | ed38bfb714172930a1cea657c247f07d03435030 (patch) | |
| tree | 813d3bf4a7d7c2d2ef432e0989d17b87d8b9144d /Modules/_multiprocessing/multiprocessing.c | |
| parent | eea10da627ad623da9eec6481a5f6fc3d4ff66e3 (diff) | |
| parent | 162fee109b4469b8b2aec063f6225e19e83ae208 (diff) | |
| download | cpython-git-ed38bfb714172930a1cea657c247f07d03435030.tar.gz | |
Merge
Diffstat (limited to 'Modules/_multiprocessing/multiprocessing.c')
| -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 5d1cf5661a..1987b951f9 100644 --- a/Modules/_multiprocessing/multiprocessing.c +++ b/Modules/_multiprocessing/multiprocessing.c @@ -111,7 +111,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; - *CMSG_DATA(cmsg) = fd; + * (int *) CMSG_DATA(cmsg) = fd; Py_BEGIN_ALLOW_THREADS res = sendmsg(conn, &msg, 0); @@ -154,7 +154,7 @@ multiprocessing_recvfd(PyObject *self, PyObject *args) if (res < 0) return PyErr_SetFromErrno(PyExc_OSError); - fd = *CMSG_DATA(cmsg); + fd = * (int *) CMSG_DATA(cmsg); return Py_BuildValue("i", fd); } |