From 741f9a61c624a3a1ec856ae781b97a8c4c36d228 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 3 Aug 2022 15:52:07 +0200 Subject: Cygwin: drop macro and code for CYGWIN_VERSION_CHECK_FOR_USING_ANCIENT_MSGHDR Signed-off-by: Corinna Vinschen --- 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 2ffe491..a4077e4 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, int flags) { msg->msg_namelen = wsamsg.namelen; msg->msg_controllen = wsamsg.Control.len; - if (!CYGWIN_VERSION_CHECK_FOR_USING_ANCIENT_MSGHDR) - msg->msg_flags = wsamsg.dwFlags; + msg->msg_flags = wsamsg.dwFlags; /* if a UDP_GRO packet is present, convert gso_size from Windows DWORD 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 be50be9..befc006 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) -#define CYGWIN_VERSION_CHECK_FOR_USING_ANCIENT_MSGHDR \ - (CYGWIN_VERSION_USER_API_VERSION_COMBINED <= 138) - #define CYGWIN_VERSION_CHECK_FOR_USING_WINSOCK1_VALUES \ (CYGWIN_VERSION_USER_API_VERSION_COMBINED <= 138) -- cgit v1.1