aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2022-08-03 15:52:07 +0200
committerCorinna Vinschen <corinna@vinschen.de>2022-08-03 15:52:07 +0200
commit741f9a61c624a3a1ec856ae781b97a8c4c36d228 (patch)
tree37dbf415421f3acd9b24f077093a2895ea0e8d3b
parentdcd78ece4586f6e37938c9cfd006159fbefcd1ff (diff)
downloadnewlib-741f9a61c624a3a1ec856ae781b97a8c4c36d228.zip
newlib-741f9a61c624a3a1ec856ae781b97a8c4c36d228.tar.gz
newlib-741f9a61c624a3a1ec856ae781b97a8c4c36d228.tar.bz2
Cygwin: drop macro and code for CYGWIN_VERSION_CHECK_FOR_USING_ANCIENT_MSGHDR
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
-rw-r--r--winsup/cygwin/fhandler_socket_inet.cc3
-rw-r--r--winsup/cygwin/include/cygwin/version.h3
2 files changed, 1 insertions, 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)