[Python-checkins] r85666 - in python/branches/release31-maint: Modules/_multiprocessing/multiprocessing.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Sun Oct 17 23:14:36 2010
New Revision: 85666

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Modules/_multiprocessing/multiprocessing.c

Modified: python/branches/release31-maint/Modules/_multiprocessing/multiprocessing.c
==============================================================================
--- python/branches/release31-maint/Modules/_multiprocessing/multiprocessing.c	(original)
+++ python/branches/release31-maint/Modules/_multiprocessing/multiprocessing.c	Sun Oct 17 23:14:36 2010
@@ -122,7 +122,7 @@
     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 @@
     if (res < 0)
         return PyErr_SetFromErrno(PyExc_OSError);
 
-    fd = *(int*)CMSG_DATA(cmsg);
+    fd = *CMSG_DATA(cmsg);
     return Py_BuildValue("i", fd);
 }