diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2020-06-01 15:43:14 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2020-06-01 15:43:14 +0200 |
| commit | f1c35a996f72ab87b60df465e0d39165f91df384 (patch) | |
| tree | 435fde7d06ddd27a67d5f1d67c7a28f107aaa6fd /win | |
| parent | 6da14d7b4a935466de55a6aa87db14bc359dbd30 (diff) | |
| parent | fd2b46d8791d4c8253a54e7bbfab4bdbd76e40d7 (diff) | |
| download | mariadb-git-f1c35a996f72ab87b60df465e0d39165f91df384.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'win')
| -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 93383f3fd20..5acbca1e186 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); |