[project @ 2001-11-21 02:29:00 by sof]

Have prototypes and implementation of prel_PrelHandle_{write,read}() match
up with the stated Haskell FFI type in PrelHandle.hs, i.e., the size
parameter is a CInt, not an Int.

diff --git a/ghc/lib/std/cbits/PrelIOUtils.c b/ghc/lib/std/cbits/PrelIOUtils.c
index 607d1bd..109c555 100644 (file)
--- a/ghc/lib/std/cbits/PrelIOUtils.c
+++ b/ghc/lib/std/cbits/PrelIOUtils.c
@@ -65,12 +65,12 @@ HsInt prel_setmode(HsInt fd, HsBool toBin)
 #endif  
 }
 
-HsInt prel_PrelHandle_write(HsInt fd, HsAddr ptr, HsInt off, HsInt sz)
+HsInt prel_PrelHandle_write(HsInt fd, HsAddr ptr, HsInt off, int sz)
 {
   return write(fd,ptr + off, sz);
 }
 
-HsInt prel_PrelHandle_read(HsInt fd, HsAddr ptr, HsInt off, HsInt sz)
+HsInt prel_PrelHandle_read(HsInt fd, HsAddr ptr, HsInt off, int sz)
 {
   return read(fd,ptr + off, sz);
 }

diff --git a/ghc/lib/std/cbits/PrelIOUtils.h b/ghc/lib/std/cbits/PrelIOUtils.h
index 4491c87..72d42e2 100644 (file)
--- a/ghc/lib/std/cbits/PrelIOUtils.h
+++ b/ghc/lib/std/cbits/PrelIOUtils.h
@@ -17,8 +17,8 @@ extern HsInt prel_o_binary();
 
 extern HsInt prel_setmode(HsInt fd, HsBool isBin);
 
-extern HsInt prel_PrelHandle_write(HsInt fd, HsAddr ptr, HsInt off, HsInt sz);
-extern HsInt prel_PrelHandle_read(HsInt fd, HsAddr ptr, HsInt off, HsInt sz);
+extern HsInt prel_PrelHandle_write(HsInt fd, HsAddr ptr, HsInt off, int sz);
+extern HsInt prel_PrelHandle_read(HsInt fd, HsAddr ptr, HsInt off, int sz);
 
 extern void* prel_PrelIO_memcpy(char *dst, HsInt dst_off, const char *src, size_t sz);