Merge branch '10.4' into 10.5

6e6d79a5 · Vladislav Vaintroub · ade8253c · f1c35a99 · 6e6d79a5
Commit 6e6d79a5 authored Jun 01, 2020 by Vladislav Vaintroub
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

win/packaging/ca/CustomAction.cpp win/packaging/ca/CustomAction.cpp +1 -1

No files found.
--- 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);