mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix build on Windows with network-3

Browse source 
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:
Joey Hess 2020-10-08 10:50:39 -04:00
parent 46bb8b90b3
commit d54dd0ef9c
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
4 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG
View file

@ -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 git-annex (8.20201007) upstream; urgency=medium
* --json output now includes a new field "input" which is the input * --json output now includes a new field "input" which is the input

5
Utility/WebApp.hs
View file

@ -86,11 +86,12 @@ webAppSettings = setTimeout halfhour defaultSettings
getSocket :: Maybe HostName -> IO Socket getSocket :: Maybe HostName -> IO Socket
getSocket h = do getSocket h = do
#if defined (mingw32_HOST_OS) #if defined (mingw32_HOST_OS)
-- getAddrInfo currently segfaults on Android.
-- The HostName is ignored by this code. -- The HostName is ignored by this code.
-- getAddrInfo didn't used to work on windows; current status
-- unknown.
when (isJust h) $ when (isJust h) $
error "getSocket with HostName not supported on this OS" 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 sock <- socket AF_INET Stream defaultProtocol
preparesocket sock preparesocket sock
bind sock (SockAddrInet defaultPort addr) bind sock (SockAddrInet defaultPort addr)

2
doc/bugs/__34__Variable_not_in_scope__34___when_compiling_on_Windows.mdwn
View file

@ -18,3 +18,5 @@ Utility\WebApp.hs:96:33: error:
- stack version: 2.3.3 - stack version: 2.3.3
- Windows version: Windows 7 Enterprise, version 6.1 - Windows version: Windows 7 Enterprise, version 6.1
> [[fixed|done]] --[[Joey]]

9
doc/bugs/__34__Variable_not_in_scope__34___when_compiling_on_Windows/comment_1_8822bbeffb9a89daceb2900ecfe045f5._comment Normal file
View file

@ -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.
"""]]