From 08d4aef8532cf8d61daa60af66f53fd2247a7a69 Mon Sep 17 00:00:00 2001
From: Ozkan Sezer <[EMAIL REDACTED]>
Date: Sat, 17 Apr 2021 23:56:50 +0300
Subject: [PATCH] windows: drop support for winsock1.1 (wsock32.lib), use
winsock2 only.
---
SDLnet.c | 4 +---
SDLnetsys.h | 10 +---------
VisualC/SDL_net_VS2008.vcproj | 4 ++--
configure | 10 ++--------
configure.ac | 10 ++--------
5 files changed, 8 insertions(+), 30 deletions(-)
diff --git a/SDLnet.c b/SDLnet.c
index 1ace0de..a79974b 100644
--- a/SDLnet.c
+++ b/SDLnet.c
@@ -95,6 +95,7 @@ int SDLNet_Init(void)
++SDLNet_started;
return(0);
}
+
void SDLNet_Quit(void)
{
if ( SDLNet_started == 0 ) {
@@ -105,9 +106,6 @@ void SDLNet_Quit(void)
/* Clean up windows networking */
if ( WSACleanup() == SOCKET_ERROR ) {
if ( WSAGetLastError() == WSAEINPROGRESS ) {
-#if !(defined(_WIN32_WCE)||defined(__USE_WINSOCK2))
- WSACancelBlockingCall();
-#endif
WSACleanup();
}
}
diff --git a/SDLnetsys.h b/SDLnetsys.h
index 1035ba7..2494879 100644
--- a/SDLnetsys.h
+++ b/SDLnetsys.h
@@ -33,16 +33,8 @@
/* Include system network headers */
#if defined(__WIN32__) || defined(WIN32)
#define __USE_W32_SOCKETS
-#if defined(_WIN64) || defined(__MINGW64_VERSION_MAJOR)
-#define __USE_WINSOCK2
#include <winsock2.h>
#include <ws2tcpip.h>
-#else
-#include <winsock.h>
-/* NOTE: windows socklen_t is signed
- * and is defined only for winsock2. */
-typedef int socklen_t;
-#endif /* W64 */
#include <iphlpapi.h>
#else /* UNIX */
#ifdef __OS2__
@@ -60,7 +52,7 @@ typedef int socklen_t;
#ifndef __BEOS__
#include <arpa/inet.h>
#endif
-#ifdef linux /* FIXME: what other platforms have this? */
+#ifdef __linux__ /* FIXME: what other platforms have this? */
#include <netinet/tcp.h>
#endif
#include <sys/socket.h>
diff --git a/VisualC/SDL_net_VS2008.vcproj b/VisualC/SDL_net_VS2008.vcproj
index 1c4f173..ed858ed 100644
--- a/VisualC/SDL_net_VS2008.vcproj
+++ b/VisualC/SDL_net_VS2008.vcproj
@@ -72,7 +72,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib iphlpapi.lib SDL.lib"
+ AdditionalDependencies="ws2_32.lib iphlpapi.lib SDL.lib"
OutputFile=".\Debug/SDL_net.dll"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -250,7 +250,7 @@
/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="wsock32.lib iphlpapi.lib SDL.lib"
+ AdditionalDependencies="ws2_32.lib iphlpapi.lib SDL.lib"
OutputFile=".\Release/SDL_net.dll"
LinkIncremental="1"
SuppressStartupBanner="true"
diff --git a/configure b/configure
index 0e38c02..1bb017a 100755
--- a/configure
+++ b/configure
@@ -15253,16 +15253,10 @@ fi
case "$host" in
*mingw32ce*)
- INETLIB="-lwinsock -lws2 -liphlpapi"
- ;;
- x86_64-*-mingw*)
- INETLIB="-lws2_32 -liphlpapi"
- ;;
- *-w64-mingw*)
- INETLIB="-lws2_32 -liphlpapi"
+ INETLIB="-lws2 -liphlpapi"
;;
*-*-cygwin* | *-*-mingw*)
- INETLIB="-lwsock32 -liphlpapi"
+ INETLIB="-lws2_32 -liphlpapi"
;;
sparc*-*-solaris*)
INETLIB="-lsocket -lnsl"
diff --git a/configure.ac b/configure.ac
index 9ddaee8..9df6cb9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,16 +82,10 @@ AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue)
dnl Figure out which networking libraries to use
case "$host" in
*mingw32ce*)
- INETLIB="-lwinsock -lws2 -liphlpapi"
- ;;
- x86_64-*-mingw*)
- INETLIB="-lws2_32 -liphlpapi"
- ;;
- *-w64-mingw*)
- INETLIB="-lws2_32 -liphlpapi"
+ INETLIB="-lws2 -liphlpapi"
;;
*-*-cygwin* | *-*-mingw*)
- INETLIB="-lwsock32 -liphlpapi"
+ INETLIB="-lws2_32 -liphlpapi"
;;
sparc*-*-solaris*)
INETLIB="-lsocket -lnsl"