[commit: unix] master: Roll back the sigset capi changes (77927c8)
Ian Lynagh
igloo at earth.li
Sat Dec 3 18:23:41 CET 2011
Repository : ssh://darcs.haskell.org//srv/darcs/packages/unix
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/77927c818b75a6f77a2c63d8f42360d3a9819002
>---------------------------------------------------------------
commit 77927c818b75a6f77a2c63d8f42360d3a9819002
Author: Ian Lynagh <igloo at earth.li>
Date: Sat Dec 3 16:43:18 2011 +0000
Roll back the sigset capi changes
They broken the build on OSX. See #2979.
>---------------------------------------------------------------
System/Posix/Signals.hsc | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/System/Posix/Signals.hsc b/System/Posix/Signals.hsc
index 463dfc7..91e642f 100644
--- a/System/Posix/Signals.hsc
+++ b/System/Posix/Signals.hsc
@@ -598,7 +598,7 @@ awaitSignal maybe_sigset = do
-- XXX My manpage says it can also return EFAULT. And why is ignoring
-- EINTR the right thing to do?
-foreign import capi unsafe "HsUnix.h sigsuspend"
+foreign import ccall unsafe "sigsuspend"
c_sigsuspend :: Ptr CSigset -> IO CInt
#endif
@@ -612,16 +612,16 @@ foreign import ccall unsafe "sigfillset"
foreign import ccall unsafe "sigismember"
c_sigismember :: Ptr CSigset -> CInt -> IO CInt
#else
-foreign import capi unsafe "HsUnix.h sigdelset"
+foreign import ccall unsafe "__hscore_sigdelset"
c_sigdelset :: Ptr CSigset -> CInt -> IO CInt
-foreign import capi unsafe "HsUnix.h sigfillset"
+foreign import ccall unsafe "__hscore_sigfillset"
c_sigfillset :: Ptr CSigset -> IO CInt
-foreign import capi unsafe "HsUnix.h sigismember"
+foreign import ccall unsafe "__hscore_sigismember"
c_sigismember :: Ptr CSigset -> CInt -> IO CInt
#endif /* __HUGS__ */
-foreign import capi unsafe "HsUnix.h sigpending"
+foreign import ccall unsafe "sigpending"
c_sigpending :: Ptr CSigset -> IO CInt
More information about the Cvs-libraries
mailing list