From 764798b7322d1cad353a6df561acab0f85148e82 Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Mon, 19 Jul 2010 18:28:33 +0000
Subject: [PATCH] Removed redundant Winsock calls from Windows-specific IPX
 code - it's already in net_ipx.c

---
 CHANGELOG.txt    |  1 +
 arch/win32/ipx.c | 11 -----------
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 87e52b4fe..7f4e487eb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,6 +6,7 @@ misc/hmp.c: Did not close hmp after MIDI conversion which caused some unfree mem
 main/gameseq.c, main/state.c, main/state.h: Introduced state_quick_item so we can safly check if there is a valid quicksave slot wihtout messing around with state_Default_item which is supposed to always show a valid slot in the first place
 main/titles.c: In briefings make sure Current_color cannot exceed possible array bounds
 include/strutil.h, main/credits.h, main/menu.c, main/bmread.c, main/newdemo.c: Fixing some harmless compiler warnings caused by missing includes, missing newlines at end of file; cleaned up strutil.h
+arch/win32/ipx.c: Removed redundant Winsock calls from Windows-specific IPX code - it's already in net_ipx.c
 
 20100718
 --------
diff --git a/arch/win32/ipx.c b/arch/win32/ipx.c
index 35f767d5c..0a9a303ed 100644
--- a/arch/win32/ipx.c
+++ b/arch/win32/ipx.c
@@ -20,16 +20,6 @@ static int ipx_open_socket(socket_t *sk, int port)
 	int len;
 	struct sockaddr_ipx ipxs2;
 	
-	WORD wVersionRequested;
-	WSADATA wsaData;
-	
-	wVersionRequested = MAKEWORD(2, 0);
-	
-	if (WSAStartup( wVersionRequested, &wsaData))
-	{
-		return -1;
-	}
-
 	sock = socket(AF_IPX, SOCK_DGRAM, NSPROTO_IPX);
 
 	if (sock == -1) {
@@ -89,7 +79,6 @@ static void ipx_close_socket(socket_t *mysock)
 	/* now close the file descriptor for the socket, and free it */
 	con_printf(CON_URGENT,"IPX: closing file descriptor on socket %x\n", mysock->socket);
 	closesocket(mysock->fd);
-	WSACleanup();
 }
 
 static int ipx_send_packet(socket_t *mysock, IPXPacket_t *IPXHeader, ubyte *data, int dataLen)