projects
/
ghc-base.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2005-01-28 15:03:06 by simonmar]
[ghc-base.git]
/
GHC
/
IO.hs
diff --git
a/GHC/IO.hs
b/GHC/IO.hs
index
b58c8cd
..
6cc8aaa
100644
(file)
--- a/
GHC/IO.hs
+++ b/
GHC/IO.hs
@@
-1,4
+1,4
@@
-{-# OPTIONS -fno-implicit-prelude -#include "HsBase.h" #-}
+{-# OPTIONS_GHC -fno-implicit-prelude -#include "HsBase.h" #-}
#undef DEBUG_DUMP
#undef DEBUG_DUMP
@@
-27,8
+27,6
@@
module GHC.IO (
memcpy_baoff_ptr,
) where
memcpy_baoff_ptr,
) where
-#include "config.h"
-
import Foreign
import Foreign.C
import Foreign
import Foreign.C
@@
-47,7
+45,7
@@
import GHC.Show
import GHC.List
import GHC.Exception ( ioError, catch )
import GHC.List
import GHC.Exception ( ioError, catch )
-#ifdef mingw32_TARGET_OS
+#ifdef mingw32_HOST_OS
import GHC.Conc
#endif
import GHC.Conc
#endif
@@
-93,7
+91,7
@@
hWaitForInput h msecs = do
(fromIntegral msecs) (haIsStream handle_)
return (r /= 0)
(fromIntegral msecs) (haIsStream handle_)
return (r /= 0)
-foreign import ccall unsafe "inputReady"
+foreign import ccall safe "inputReady"
inputReady :: CInt -> CInt -> Bool -> IO CInt
-- ---------------------------------------------------------------------------
inputReady :: CInt -> CInt -> Bool -> IO CInt
-- ---------------------------------------------------------------------------
@@
-727,7
+725,7
@@
writeChunkNonBlocking fd is_stream ptr bytes = loop 0 bytes
loop :: Int -> Int -> IO Int
loop off bytes | bytes <= 0 = return off
loop off bytes = do
loop :: Int -> Int -> IO Int
loop off bytes | bytes <= 0 = return off
loop off bytes = do
-#ifndef mingw32_TARGET_OS
+#ifndef mingw32_HOST_OS
ssize <- c_write (fromIntegral fd) (ptr `plusPtr` off) (fromIntegral bytes)
let r = fromIntegral ssize :: Int
if (r == -1)
ssize <- c_write (fromIntegral fd) (ptr `plusPtr` off) (fromIntegral bytes)
let r = fromIntegral ssize :: Int
if (r == -1)
@@
-901,7
+899,7
@@
bufReadNonBlocking fd ref is_stream ptr so_far count =
readChunkNonBlocking :: FD -> Bool -> Ptr a -> Int -> IO Int
readChunkNonBlocking fd is_stream ptr bytes = do
readChunkNonBlocking :: FD -> Bool -> Ptr a -> Int -> IO Int
readChunkNonBlocking fd is_stream ptr bytes = do
-#ifndef mingw32_TARGET_OS
+#ifndef mingw32_HOST_OS
ssize <- c_read (fromIntegral fd) (castPtr ptr) (fromIntegral bytes)
let r = fromIntegral ssize :: Int
if (r == -1)
ssize <- c_read (fromIntegral fd) (castPtr ptr) (fromIntegral bytes)
let r = fromIntegral ssize :: Int
if (r == -1)