Fix build on Windows with network-3
inet_addr was removed, but all this needs is localhost, so hardcoding it should work fine. It may be that this windows ifdef is no longer needed. It was added in 2013 with a note that getAddrInfo didn't work on windows, but it seems likely such a problem would have been fixed since.
This commit is contained in:
parent
46bb8b90b3
commit
d54dd0ef9c
4 changed files with 20 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
|||
git-annex (8.20201008) UNRELEASED; urgency=medium
|
||||
|
||||
* Fix build on Windows with network-3.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Thu, 08 Oct 2020 10:48:17 -0400
|
||||
|
||||
git-annex (8.20201007) upstream; urgency=medium
|
||||
|
||||
* --json output now includes a new field "input" which is the input
|
||||
|
|
|
@ -86,11 +86,12 @@ webAppSettings = setTimeout halfhour defaultSettings
|
|||
getSocket :: Maybe HostName -> IO Socket
|
||||
getSocket h = do
|
||||
#if defined (mingw32_HOST_OS)
|
||||
-- getAddrInfo currently segfaults on Android.
|
||||
-- The HostName is ignored by this code.
|
||||
-- getAddrInfo didn't used to work on windows; current status
|
||||
-- unknown.
|
||||
when (isJust h) $
|
||||
error "getSocket with HostName not supported on this OS"
|
||||
addr <- inet_addr "127.0.0.1"
|
||||
let addr = tupleToHostAddress (127,0,0,1)
|
||||
sock <- socket AF_INET Stream defaultProtocol
|
||||
preparesocket sock
|
||||
bind sock (SockAddrInet defaultPort addr)
|
||||
|
|
|
@ -18,3 +18,5 @@ Utility\WebApp.hs:96:33: error:
|
|||
|
||||
- stack version: 2.3.3
|
||||
- Windows version: Windows 7 Enterprise, version 6.1
|
||||
|
||||
> [[fixed|done]] --[[Joey]]
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
[[!comment format=mdwn
|
||||
username="joey"
|
||||
subject="""comment 1"""
|
||||
date="2020-10-08T14:38:26Z"
|
||||
content="""
|
||||
Those came from the network library, but were removed in network-3.0.
|
||||
|
||||
I've updated it to work with the new library.
|
||||
"""]]
|
Loading…
Reference in a new issue