changeset: 95375:aad52bfc816f user: Victor Stinner date: Thu Apr 02 12:28:07 2015 +0200 files: Modules/socketmodule.c description: Issue #23618: Don't declare recvmsg/sendmsg helper functions on Windows diff -r bb0b5b6c13f3 -r aad52bfc816f Modules/socketmodule.c --- a/Modules/socketmodule.c Thu Apr 02 11:47:51 2015 +0300 +++ b/Modules/socketmodule.c Thu Apr 02 12:28:07 2015 +0200 @@ -3109,6 +3109,9 @@ \n\ Like recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info."); +/* The sendmsg() and recvmsg[_into]() methods require a working + CMSG_LEN(). See the comment near get_CMSG_LEN(). */ +#ifdef CMSG_LEN struct sock_recvmsg { struct msghdr *msg; int flags; @@ -3124,10 +3127,6 @@ return (ctx->result >= 0); } - -/* The sendmsg() and recvmsg[_into]() methods require a working - CMSG_LEN(). See the comment near get_CMSG_LEN(). */ -#ifdef CMSG_LEN /* * Call recvmsg() with the supplied iovec structures, flags, and * ancillary data buffer size (controllen). Returns the tuple return @@ -3641,6 +3640,9 @@ For IP sockets, the address is a pair (hostaddr, port)."); +/* The sendmsg() and recvmsg[_into]() methods require a working + CMSG_LEN(). See the comment near get_CMSG_LEN(). */ +#ifdef CMSG_LEN struct sock_sendmsg { struct msghdr *msg; int flags; @@ -3656,9 +3658,6 @@ return (ctx->result >= 0); } -/* The sendmsg() and recvmsg[_into]() methods require a working - CMSG_LEN(). See the comment near get_CMSG_LEN(). */ -#ifdef CMSG_LEN /* s.sendmsg(buffers[, ancdata[, flags[, address]]]) method */ static PyObject *