drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cygwin: drop macro and code for CYGWIN_VERSION_CHECK_FOR_USING_WINSOCK1_VALUES 

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2022-08-03 15:53:41 +02:00
parent 741f9a61c6
commit 57c3ca8d51
2 changed files with 0 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
winsup/cygwin/fhandler_socket_inet.cc
View File

@ -177,27 +177,6 @@ get_ext_funcptr (SOCKET sock, void *funcptr)
&bret, NULL, NULL); &bret, NULL, NULL);
} }
static int
convert_ws1_ip_optname (int optname)
{
static int ws2_optname[] =
{
0,
IP_OPTIONS,
IP_MULTICAST_IF,
IP_MULTICAST_TTL,
IP_MULTICAST_LOOP,
IP_ADD_MEMBERSHIP,
IP_DROP_MEMBERSHIP,
IP_TTL,
IP_TOS,
IP_DONTFRAGMENT
};
return (optname < 1 || optname > _WS1_IP_DONTFRAGMENT)
? optname
: ws2_optname[optname];
}
fhandler_socket_wsock::fhandler_socket_wsock () : fhandler_socket_wsock::fhandler_socket_wsock () :
fhandler_socket (), fhandler_socket (),
wsock_events (NULL), wsock_events (NULL),
@ -1832,9 +1811,6 @@ fhandler_socket_inet::setsockopt (int level, int optname, const void *optval,
break; break;
case IPPROTO_IP: case IPPROTO_IP:
/* Old applications still use the old WinSock1 IPPROTO_IP values. */
if (CYGWIN_VERSION_CHECK_FOR_USING_WINSOCK1_VALUES)
optname = convert_ws1_ip_optname (optname);
switch (optname) switch (optname)
{ {
case IP_TOS: case IP_TOS:
@ -2158,9 +2134,6 @@ fhandler_socket_inet::getsockopt (int level, int optname, const void *optval,
break; break;
case IPPROTO_IP: case IPPROTO_IP:
/* Old applications still use the old WinSock1 IPPROTO_IP values. */
if (CYGWIN_VERSION_CHECK_FOR_USING_WINSOCK1_VALUES)
optname = convert_ws1_ip_optname (optname);
break; break;
case IPPROTO_TCP: case IPPROTO_TCP:

3
winsup/cygwin/include/cygwin/version.h
View File

@ -34,9 +34,6 @@ details. */
#define CYGWIN_VERSION_USER_API_VERSION_COMBINED \ #define CYGWIN_VERSION_USER_API_VERSION_COMBINED \
CYGWIN_VERSION_PER_PROCESS_API_VERSION_COMBINED (user_data) CYGWIN_VERSION_PER_PROCESS_API_VERSION_COMBINED (user_data)
#define CYGWIN_VERSION_CHECK_FOR_USING_WINSOCK1_VALUES \
(CYGWIN_VERSION_USER_API_VERSION_COMBINED <= 138)
#define CYGWIN_VERSION_CHECK_FOR_OLD_IFREQ \ #define CYGWIN_VERSION_CHECK_FOR_OLD_IFREQ \
(CYGWIN_VERSION_USER_API_VERSION_COMBINED <= 161) (CYGWIN_VERSION_USER_API_VERSION_COMBINED <= 161)