Merge commit 'c632697' into bfgminer-3.5.x

api.c

@@ -4050,10 +4050,6 @@ void api(int api_thr_id)
 		}
 	}
 
-	/* This should be done before curl in needed
-	 * to ensure curl has already called WSAStartup() in windows */
-	cgsleep_ms(opt_log_interval*1000);
-
 	*apisock = socket(AF_INET, SOCK_STREAM, 0);
 	if (*apisock == INVSOCK) {
 		applog(LOG_ERR, "API1 initialisation failed (%s)%s", SOCKERRMSG, UNAVAILABLE);

miner.c

@@ -9784,6 +9784,10 @@ void _bfg_clean_up(void)
 		free(cpus);
 
 	curl_global_cleanup();
+	
+#ifdef WIN32
+	WSACleanup();
+#endif
 }
 
 void _quit(int status)
@@ -10439,6 +10443,15 @@ int main(int argc, char *argv[])
 	setup_pthread_cancel_workaround();
 #endif
 
+#ifdef WIN32
+	{
+		WSADATA wsa;
+		i = WSAStartup(MAKEWORD(2, 2), &wsa);
+		if (i)
+			quit(1, "Failed to initialise Winsock: %s", bfg_strerror(i, BST_SOCKET));
+	}
+#endif
+	
 	/* This dangerous functions tramples random dynamically allocated
 	 * variables so do it before anything at all */
 	if (unlikely(curl_global_init(CURL_GLOBAL_ALL)))