commit 3fc2c65d2f774d9ef3de55ee602c91c4aec99c02
author Andy Green <andy.green@linaro.org> Mon Jan 14 15:35:02 2013 +0800
committer Andy Green <andy.green@linaro.org> Tue Jan 15 15:41:05 2013 +0800
tree 6bedee40c799c330d1ca3d577a4eb30ed351dd49
parent 455d1fed06769efe695a7bbb85e34d353142a656

replace ifdefs around close socket with compatible_close

Signed-off-by: Andy Green <andy.green@linaro.org>

lib/libwebsockets.c

diff --git a/lib/libwebsockets.c b/lib/libwebsockets.c
index c084cfc..4cc70b4 100644
--- a/lib/libwebsockets.c
+++ b/lib/libwebsockets.c
@@ -392,22 +392,14 @@
 	if (wsi->ssl) {
 		n = SSL_get_fd(wsi->ssl);
 		SSL_shutdown(wsi->ssl);
-#ifdef WIN32
-		closesocket(n);
-#else
-		close(n);
-#endif
+		compatible_close(n);
 		SSL_free(wsi->ssl);
 	} else {
 #endif
 		shutdown(wsi->sock, SHUT_RDWR);
-#ifdef WIN32
+
 		if (wsi->sock)
-			closesocket(wsi->sock);
-#else
-		if (wsi->sock)
-			close(wsi->sock);
-#endif
+			compatible_close(wsi->sock);
 #ifdef LWS_OPENSSL_SUPPORT
 	}
 #endif
@@ -1585,21 +1577,13 @@
 				LWS_CALLBACK_FILTER_NETWORK_CONNECTION,
 					   (void *)(long)accept_fd, NULL, 0)) {
 			lwsl_debug("Callback denied network connection\n");
-#ifdef WIN32
-			closesocket(accept_fd);
-#else
-			close(accept_fd);
-#endif
+			compatible_close(accept_fd);
 			break;
 		}
 
 		new_wsi = libwebsocket_create_new_server_wsi(context);
 		if (new_wsi == NULL) {
-#ifdef WIN32
-			closesocket(accept_fd);
-#else
-			close(accept_fd);
-#endif
+			compatible_close(accept_fd);
 			break;
 		}
 
@@ -1618,11 +1602,7 @@
 				    new_wsi->ssl, 0), NULL));
 				    libwebsockets_decode_ssl_error();
 				free(new_wsi);
-#ifdef WIN32
-				closesocket(accept_fd);
-#else
-				close(accept_fd);
-#endif
+				compatible_close(accept_fd);
 				break;
 			}
 
@@ -1645,11 +1625,7 @@
 				SSL_free(
 				       new_wsi->ssl);
 				free(new_wsi);
-#ifdef WIN32
-				closesocket(accept_fd);
-#else
-				close(accept_fd);
-#endif
+				compatible_close(accept_fd);
 				break;
 			}
 
@@ -1736,11 +1712,7 @@
 		break;
 
 bail_prox_listener:
-#ifdef WIN32
-		closesocket(accept_fd);
-#else
-		close(accept_fd);
-#endif
+		compatible_close(accept_fd);
 		break;
 
 	case LWS_CONNMODE_BROADCAST_PROXY: