Main: move WinSock initialization to class ScopeNetInit

src/Main.cxx

@@ -50,6 +50,7 @@
 #include "unix/SignalHandlers.hxx"
 #include "system/FatalError.hxx"
 #include "thread/Slack.hxx"
+#include "net/Init.hxx"
 #include "lib/icu/Init.hxx"
 #include "config/ConfigGlobal.hxx"
 #include "config/Param.hxx"
@@ -106,11 +107,6 @@
 #include <locale.h>
 #endif
 
-#ifdef _WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#endif
-
 #ifdef __BLOCKS__
 #include <dispatch/dispatch.h>
 #endif
@@ -284,25 +280,6 @@ glue_state_file_init()
 	instance->state_file->Read();
 }
 
-/**
- * Windows-only initialization of the Winsock2 library.
- */
-static void winsock_init(void)
-{
-#ifdef _WIN32
-	WSADATA sockinfo;
-
-	int retval = WSAStartup(MAKEWORD(2, 2), &sockinfo);
-	if(retval != 0)
-		FormatFatalError("Attempt to open Winsock2 failed; error code %d",
-				 retval);
-
-	if (LOBYTE(sockinfo.wVersion) != 2)
-		FatalError("We use Winsock2 but your version is either too new "
-			   "or old; please install Winsock 2.x");
-#endif
-}
-
 /**
  * Initialize the decoder and player core, including the music pipe.
  */
@@ -451,7 +428,8 @@ try {
 
 	IcuInit();
 
-	winsock_init();
+	const ScopeNetInit net_init;
+
 	io_thread_init();
 	config_global_init();
 
@@ -702,10 +680,6 @@ try {
 	daemonize_finish();
 #endif
 
-#ifdef _WIN32
-	WSACleanup();
-#endif
-
 	IcuFinish();
 
 	log_deinit();