Add option to compile against winsock

And replace the old PLATFORM flag to match

src/CMakeLists.txt

@@ -46,16 +46,22 @@ if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
 	option (USE_OPENSSL_BACKEND "Use the openssl backend" ON)
 	option (USE_SCHANNEL_BACKEND "Use the schannel backend (windows-only)" OFF)
 	option (USE_NSURL_BACKEND "Use the NSUrl backend (macos-only)" OFF)
+
+	option (USE_WINSOCK "Use winsock instead of BSD sockets (windows-only)" OFF)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
 	option (USE_CURL_BACKEND "Use the libcurl backend" OFF)
 	option (USE_OPENSSL_BACKEND "Use the openssl backend" OFF)
 	option (USE_SCHANNEL_BACKEND "Use the schannel backend (windows-only)" ON)
 	option (USE_NSURL_BACKEND "Use the NSUrl backend (macos-only)" OFF)
+
+	option (USE_WINSOCK "Use winsock instead of BSD sockets (windows-only)" ON)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
 	option (USE_CURL_BACKEND "Use the libcurl backend" OFF)
 	option (USE_OPENSSL_BACKEND "Use the openssl backend" OFF)
 	option (USE_SCHANNEL_BACKEND "Use the schannel backend (windows-only)" OFF)
 	option (USE_NSURL_BACKEND "Use the NSUrl backend (macos-only)" ON)
+
+	option (USE_WINSOCK "Use winsock instead of BSD sockets (windows-only)" OFF)
 endif ()
 
 ### Dependencies

src/common/PlaintextConnection.cpp

@@ -1,5 +1,6 @@
+#include "common/config.h"
 #include <cstring>
-#ifndef PLATFORM_WINDOWS
+#ifndef USE_WINSOCK
 #	include <netdb.h>
 #	include <unistd.h>
 #	include <sys/types.h>
@@ -9,28 +10,28 @@
 #	include <ws2tcpip.h>
 #	undef min
 #	undef max
-#endif // PLATFORM_WINDOWS
+#endif // USE_WINSOCK
 
 #include "PlaintextConnection.h"
 
-#ifdef PLATFORM_WINDOWS
+#ifdef USE_WINSOCK
 	static void close(int fd)
 	{
 		closesocket(fd);
 	}
-#endif // PLATFORM_WINDOWS
+#endif // USE_WINSOCK
 
 PlaintextConnection::PlaintextConnection()
 	: fd(-1)
 {
-#ifdef PLATFORM_WINDOWS
+#ifdef USE_WINSOCK
 	static bool wsaInit = false;
 	if (!wsaInit)
 	{
 		WSADATA data;
 		WSAStartup(MAKEWORD(2, 2), &data);
 	}
-#endif
+#endif // USE_WINSOCK
 }
 
 PlaintextConnection::~PlaintextConnection()

src/common/config.h.in

@@ -2,3 +2,4 @@
 #cmakedefine USE_OPENSSL_BACKEND
 #cmakedefine USE_SCHANNEL_BACKEND
 #cmakedefine USE_NSURL_BACKEND
+#cmakedefine USE_WINSOCK