From 53f77b416feb8b019f206cf9ae535e41f9729dac Mon Sep 17 00:00:00 2001
From: Ganlin Zhao <ganlinzhao@hotmail.com>
Date: Mon, 14 Nov 2022 10:54:25 +0800
Subject: [PATCH] fix windows compilation error

---
 src/os/src/detail/osSocket.c | 6 +++++-
 src/util/src/tsocket.c       | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/os/src/detail/osSocket.c b/src/os/src/detail/osSocket.c
index 7ce9d6eb06..0b6cda29b4 100644
--- a/src/os/src/detail/osSocket.c
+++ b/src/os/src/detail/osSocket.c
@@ -71,9 +71,13 @@ int32_t taosSetSockOpt(SOCKET socketfd, int32_t level, int32_t optname, void *op
   return setsockopt(socketfd, level, optname, optval, (socklen_t)optlen);
 }
 
+#endif
+
+#if !defined(_TD_DARWIN_32)
+
 int32_t taosGetSockOpt(SOCKET socketfd, int32_t level, int32_t optname, void *optval, int32_t* optlen) {
   return getsockopt(socketfd, level, optname, optval, (socklen_t *)optlen);
-} 
+}
 
 #endif
 
diff --git a/src/util/src/tsocket.c b/src/util/src/tsocket.c
index 43812bd713..636dff145c 100644
--- a/src/util/src/tsocket.c
+++ b/src/util/src/tsocket.c
@@ -386,7 +386,7 @@ SOCKET taosOpenTcpClientSocket(uint32_t destIp, uint16_t destPort, uint32_t clie
     }
   }
   taosSetNonblocking(sockFd, 0);
-#elif defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32) || defined(_TD_WINDOWS)
+#elif defined(_TD_WINDOWS_64) || defined(_TD_WINDOWS_32)
   taosSetNonblocking(sockFd, 1);
 
   ret = connect(sockFd, (struct sockaddr *)&serverAddr, sizeof(serverAddr));
@@ -396,7 +396,7 @@ SOCKET taosOpenTcpClientSocket(uint32_t destIp, uint16_t destPort, uint32_t clie
       taosCloseSocket(sockFd);
       return -1;
     } else if (errno == EINPROGRESS || errno == EAGAIN || errno == EWOULDBLOCK) {
-      timeval timeout;
+      struct timeval timeout;
       fd_set set;
 
       timeout.tv_sec = 0;
-- 
GitLab