From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 1C5093857B8A; Wed, 3 Aug 2022 14:06:00 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1C5093857B8A Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: drop macro and code for CYGWIN_VERSION_CHECK_FOR_USING_ANCIENT_MSGHDR X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: dcd78ece4586f6e37938c9cfd006159fbefcd1ff X-Git-Newrev: 741f9a61c624a3a1ec856ae781b97a8c4c36d228 Message-Id: <20220803140600.1C5093857B8A@sourceware.org> Date: Wed, 3 Aug 2022 14:06:00 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Aug 2022 14:06:00 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D741f9a61c62= 4a3a1ec856ae781b97a8c4c36d228 commit 741f9a61c624a3a1ec856ae781b97a8c4c36d228 Author: Corinna Vinschen Date: Wed Aug 3 15:52:07 2022 +0200 Cygwin: drop macro and code for CYGWIN_VERSION_CHECK_FOR_USING_ANCIENT_= MSGHDR =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/fhandler_socket_inet.cc | 3 +-- winsup/cygwin/include/cygwin/version.h | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/winsup/cygwin/fhandler_socket_inet.cc b/winsup/cygwin/fhandler= _socket_inet.cc index 2ffe4917f..a4077e4ec 100644 --- a/winsup/cygwin/fhandler_socket_inet.cc +++ b/winsup/cygwin/fhandler_socket_inet.cc @@ -1316,8 +1316,7 @@ fhandler_socket_wsock::recvmsg (struct msghdr *msg, i= nt flags) { msg->msg_namelen =3D wsamsg.namelen; msg->msg_controllen =3D wsamsg.Control.len; - if (!CYGWIN_VERSION_CHECK_FOR_USING_ANCIENT_MSGHDR) - msg->msg_flags =3D wsamsg.dwFlags; + msg->msg_flags =3D wsamsg.dwFlags; /* if a UDP_GRO packet is present, convert gso_size from Windows DWO= RD to Linux-compatible uint16_t. We don't have to change the msg_control block layout for that, assuming applications do as they diff --git a/winsup/cygwin/include/cygwin/version.h b/winsup/cygwin/include= /cygwin/version.h index be50be988..befc006bb 100644 --- a/winsup/cygwin/include/cygwin/version.h +++ b/winsup/cygwin/include/cygwin/version.h @@ -34,9 +34,6 @@ details. */ #define CYGWIN_VERSION_USER_API_VERSION_COMBINED \ CYGWIN_VERSION_PER_PROCESS_API_VERSION_COMBINED (user_data) =20 -#define CYGWIN_VERSION_CHECK_FOR_USING_ANCIENT_MSGHDR \ - (CYGWIN_VERSION_USER_API_VERSION_COMBINED <=3D 138) - #define CYGWIN_VERSION_CHECK_FOR_USING_WINSOCK1_VALUES \ (CYGWIN_VERSION_USER_API_VERSION_COMBINED <=3D 138)