Browse Source

Patch from Frediano Ziglio: Windows compilation fixes on eventdns.c.

svn:r6971
Nick Mathewson 19 years ago
parent
commit
19cf66c0f1
1 changed files with 6 additions and 2 deletions
  1. 6 2
      src/or/eventdns.c

+ 6 - 2
src/or/eventdns.c

@@ -1186,8 +1186,8 @@ eventdns_nameserver_add(unsigned long int address) {
 	if (ns->socket < 0) { err = 1; goto out1; }
 #ifdef MS_WINDOWS
         {
-		int nonblocking = 1;
-		ioctlsocket(socket, FIONBIO, (unsigned long*) &nonblocking);
+		u_long nonblocking = 1;
+		ioctlsocket(ns->socket, FIONBIO, &nonblocking);
 	}
 #else
         fcntl(ns->socket, F_SETFL, O_NONBLOCK);
@@ -1223,7 +1223,11 @@ eventdns_nameserver_add(unsigned long int address) {
 	return 0;
 
 out2:
+#ifdef MS_WINDOWS
+	closesocket(ns->socket);
+#else
 	close(ns->socket);
+#endif
 out1:
 	free(ns);
 	return err;