Skip to content

Commit 469c627

Browse files
committed
Merge PR #489
2 parents 20c9bb9 + 2804199 commit 469c627

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Network/Socket.hs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,14 +208,12 @@ module Network.Socket
208208
, socketPortSafe
209209
, socketPort
210210

211-
#if !defined(mingw32_HOST_OS)
212211
-- * UNIX-domain socket
213212
, isUnixDomainSocketAvailable
214213
, socketPair
215214
, sendFd
216215
, recvFd
217216
, getPeerCredential
218-
#endif
219217

220218
-- * Name information
221219
, getNameInfo
@@ -278,9 +276,9 @@ import Network.Socket.Shutdown
278276
import Network.Socket.SockAddr
279277
import Network.Socket.Syscall hiding (connect, bind, accept)
280278
import Network.Socket.Types
279+
import Network.Socket.Unix
281280
#if !defined(mingw32_HOST_OS)
282281
import Network.Socket.Posix.Cmsg
283-
import Network.Socket.Unix
284282
#else
285283
import Network.Socket.Win32.Cmsg
286284
#endif

Network/Socket/Unix.hsc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ import System.Posix.Types (Fd(..))
1717

1818
import Network.Socket.Buffer
1919
import Network.Socket.Imports
20+
#if !defined(mingw32_HOST_OS)
2021
import Network.Socket.Posix.Cmsg
22+
#endif
2123
import Network.Socket.Types
2224

2325
#if defined(HAVE_GETPEEREID)

network.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ library
8484
Network.Socket.SockAddr
8585
Network.Socket.Syscall
8686
Network.Socket.Types
87+
Network.Socket.Unix
8788

8889
build-depends:
8990
base >= 4.9 && < 5,
@@ -107,7 +108,6 @@ library
107108
Network.Socket.Posix.CmsgHdr
108109
Network.Socket.Posix.IOVec
109110
Network.Socket.Posix.MsgHdr
110-
Network.Socket.Unix
111111

112112
if os(solaris)
113113
extra-libraries: nsl, socket

0 commit comments

Comments
 (0)