From: dimitris@microsoft.com <unknown>
Date: Wed, 17 Nov 2010 18:33:51 +0000 (+0000)
Subject: Fixing uses of fromIntegral for Windows
X-Git-Url: http://git.megacz.com/?p=ghc-base.git;a=commitdiff_plain;h=0c074a8eef70fd5c9ff19db84eb3564b9e3a89d3

Fixing uses of fromIntegral for Windows
---

diff --git a/GHC/IO/FD.hs b/GHC/IO/FD.hs
index 4c3e117..d873a4e 100644
--- a/GHC/IO/FD.hs
+++ b/GHC/IO/FD.hs
@@ -1,4 +1,5 @@
-{-# OPTIONS_GHC -XNoImplicitPrelude -XBangPatterns #-}
+{-# OPTIONS_GHC -XNoImplicitPrelude -XBangPatterns -fno-warn-identities #-}
+-- Whether there are identities depends on the platform
 {-# OPTIONS_HADDOCK hide #-}
 -----------------------------------------------------------------------------
 -- |
@@ -395,13 +396,14 @@ setRaw fd raw = System.Posix.Internals.setCooked (fdFD fd) (not raw)
 
 fdRead :: FD -> Ptr Word8 -> Int -> IO Int
 fdRead fd ptr bytes
-  = readRawBufferPtr "GHC.IO.FD.fdRead" fd ptr 0 (fromIntegral bytes)
+  = do { r <- readRawBufferPtr "GHC.IO.FD.fdRead" fd ptr 0 (fromIntegral bytes)
+       ; return (fromIntegral r) }
 
 fdReadNonBlocking :: FD -> Ptr Word8 -> Int -> IO (Maybe Int)
 fdReadNonBlocking fd ptr bytes = do
   r <- readRawBufferPtrNoBlock "GHC.IO.FD.fdReadNonBlocking" fd ptr 
            0 (fromIntegral bytes)
-  case r of
+  case fromIntegral r of
     (-1) -> return (Nothing)
     n    -> return (Just n)