Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a3451b85fb57066aa0d7f4b0506f116dd73008f6 >--------------------------------------------------------------- commit a3451b85fb57066aa0d7f4b0506f116dd73008f6 Author: Ian Lynagh <[email protected]> Date: Sun Dec 4 13:20:40 2011 +0000 Roll back the sigset capi changes They broken the build on OSX. See #2979. >--------------------------------------------------------------- System/Posix/Internals.hs | 6 +++--- include/HsBase.h | 22 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/System/Posix/Internals.hs b/System/Posix/Internals.hs index a9c2eab..2c2b965 100644 --- a/System/Posix/Internals.hs +++ b/System/Posix/Internals.hs @@ -480,13 +480,13 @@ foreign import ccall unsafe "HsBase.h mkfifo" foreign import ccall unsafe "HsBase.h pipe" c_pipe :: Ptr CInt -> IO CInt -foreign import capi unsafe "HsBase.h sigemptyset" +foreign import ccall unsafe "HsBase.h __hscore_sigemptyset" c_sigemptyset :: Ptr CSigset -> IO CInt -foreign import capi unsafe "HsBase.h sigaddset" +foreign import ccall unsafe "HsBase.h __hscore_sigaddset" c_sigaddset :: Ptr CSigset -> CInt -> IO CInt -foreign import capi unsafe "HsBase.h sigprocmask" +foreign import ccall unsafe "HsBase.h sigprocmask" c_sigprocmask :: CInt -> Ptr CSigset -> Ptr CSigset -> IO CInt foreign import ccall unsafe "HsBase.h tcgetattr" diff --git a/include/HsBase.h b/include/HsBase.h index bad3a4b..cc27cc3 100644 --- a/include/HsBase.h +++ b/include/HsBase.h @@ -181,6 +181,28 @@ INLINE int __hscore_s_issock(mode_t m) { return S_ISSOCK(m); } #endif #endif +#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32) +INLINE int +__hscore_sigemptyset( sigset_t *set ) +{ return sigemptyset(set); } + +INLINE int +__hscore_sigfillset( sigset_t *set ) +{ return sigfillset(set); } + +INLINE int +__hscore_sigaddset( sigset_t * set, int s ) +{ return sigaddset(set,s); } + +INLINE int +__hscore_sigdelset( sigset_t * set, int s ) +{ return sigdelset(set,s); } + +INLINE int +__hscore_sigismember( sigset_t * set, int s ) +{ return sigismember(set,s); } +#endif + INLINE void * __hscore_memcpy_src_off( char *dst, char *src, int src_off, size_t sz ) { return memcpy(dst, src+src_off, sz); } _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
