diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-06-01 15:44:01 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-06-01 15:44:01 +0200 |
| commit | 6e6d79a5cfc59fcbeed27eef5e5e1050b6b8a43a (patch) | |
| tree | 3b0e88da52fc5f7f913e16588b07ac35e3e1beff | |
| parent | ade8253cb9260371ffd393f0962f56619c949c07 (diff) | |
| parent | f1c35a996f72ab87b60df465e0d39165f91df384 (diff) | |
| download | mariadb-git-6e6d79a5cfc59fcbeed27eef5e5e1050b6b8a43a.tar.gz | |
Merge branch '10.4' into 10.5
| -rw-r--r-- | win/packaging/ca/CustomAction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win/packaging/ca/CustomAction.cpp b/win/packaging/ca/CustomAction.cpp index 761225a695c..ccb83c7b0c6 100644 --- 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); |