2 files changed, 22 insertions, 0 deletions
diff --git a/src/libstrongswan/utils/windows.c b/src/libstrongswan/utils/windows.c
index 48a70b6c2..492821d53 100644
--- a/src/libstrongswan/utils/windows.c
+++ b/src/libstrongswan/utils/windows.c
@@ -334,6 +334,22 @@ static bool check_dontwait(int *flags)
 /**
  * See header
  */
+#undef close
+int windows_close(int fd)
+{
+	int ret;
+
+	ret = close(fd);
+	if (ret == -1 && errno == EBADF)
+	{	/* Winsock socket? */
+		ret = wserr(closesocket(fd));
+	}
+	return ret;
+}
+
+/**
+ * See header
+ */
 #undef recv
 ssize_t windows_recv(int sockfd, void *buf, size_t len, int flags)
 {
diff --git a/src/libstrongswan/utils/windows.h b/src/libstrongswan/utils/windows.h
index d57b5dc1d..3e317ce59 100644
--- a/src/libstrongswan/utils/windows.h
+++ b/src/libstrongswan/utils/windows.h
@@ -265,6 +265,12 @@ int socketpair(int domain, int type, int protocol, int sv[2]);
 #define ECONNRESET ENXIO
 
 /**
+ * close(2) working for file handles and Winsock sockets
+ */
+#define close windows_close
+int windows_close(int fd);
+
+/**
  * recv(2) with support for MSG_DONTWAIT
  */
 #define recv windows_recv