Merge branch '10.4' into 10.5

6 years ago · 6e6d79a5cf
1 changed files with 1 additions and 1 deletions
--- a/win/packaging/ca/CustomAction.cpp
+++ b/win/packaging/ca/CustomAction.cpp
@ -326,7 +326,7 @@ static bool IsPortInUse(unsigned short port)
  }

  bool in_use = false;
-  if (bind(ip_sock, a->ai_addr, a->ai_addrlen) == SOCKET_ERROR)
+  if (bind(ip_sock, a->ai_addr, (int)a->ai_addrlen) == SOCKET_ERROR)
  {
    DWORD last_error = WSAGetLastError();
    in_use = (last_error ==  WSAEADDRINUSE || last_error == WSAEACCES);