[newlib-cygwin] Cygwin: drop macro and code for CYGWIN_VERSION_CHECK_FOR_USING_ANCIENT_MSGHDR

Corinna Vinschen corinna@sourceware.org
Wed Aug 3 14:06:00 GMT 2022


https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=741f9a61c624a3a1ec856ae781b97a8c4c36d228

commit 741f9a61c624a3a1ec856ae781b97a8c4c36d228
Author: Corinna Vinschen <corinna@vinschen.de>
Date:   Wed Aug 3 15:52:07 2022 +0200

    Cygwin: drop macro and code for CYGWIN_VERSION_CHECK_FOR_USING_ANCIENT_MSGHDR
    
    Signed-off-by: Corinna Vinschen <corinna@vinschen.de>

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, 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 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)
 
-#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)


More information about the Cygwin-cvs mailing list