Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : master
http://hackage.haskell.org/trac/ghc/changeset/89e58b99fa48c80724c7d7d5559b171125d59d71 >--------------------------------------------------------------- commit 89e58b99fa48c80724c7d7d5559b171125d59d71 Author: Paolo Capriotti <[email protected]> Date: Tue May 8 20:17:45 2012 +0100 Fix build. >--------------------------------------------------------------- GHC/IO/FD.hs | 4 +++- System/Posix/Types.hs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/GHC/IO/FD.hs b/GHC/IO/FD.hs index bbd55cc..f9df794 100644 --- a/GHC/IO/FD.hs +++ b/GHC/IO/FD.hs @@ -266,7 +266,7 @@ mkFD fd iomode mb_stat is_socket is_nonblock = do getUniqueFileInfo :: CInt -> CDev -> CIno -> IO (Word64, Word64) #ifndef mingw32_HOST_OS -getUniqueFileInfo _ dev ino = return (fromInteger dev, fromInteger ino) +getUniqueFileInfo _ dev ino = return (fromIntegral dev, fromIntegral ino) #else getUniqueFileInfo fd _ _ = do with 0 $ \devptr -> do @@ -658,5 +658,7 @@ foreign import ccall unsafe "lockFile" foreign import ccall unsafe "unlockFile" unlockFile :: CInt -> IO CInt +#ifdef mingw32_HOST_OS foreign import ccall unsafe "get_unique_file_info" c_getUniqueFileInfo :: CInt -> Ptr Word64 -> Ptr Word64 -> IO () +#endif diff --git a/System/Posix/Types.hs b/System/Posix/Types.hs index 0dc3beb..32206aa 100644 --- a/System/Posix/Types.hs +++ b/System/Posix/Types.hs @@ -136,7 +136,7 @@ import Control.Monad #include "CTypes.h" #if defined(HTYPE_DEV_T) -ARITHMETIC_TYPE(CDev,tyConCDev,"CDev",HTYPE_DEV_T) +INTEGRAL_TYPE(CDev,tyConCDev,"CDev",HTYPE_DEV_T) #endif #if defined(HTYPE_INO_T) INTEGRAL_TYPE(CIno,tyConCIno,"CIno",HTYPE_INO_T) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
