[project @ 2001-11-07 19:37:17 by sof]

made to work on Unices

diff --git a/ghc/lib/std/cbits/PrelIOUtils.c b/ghc/lib/std/cbits/PrelIOUtils.c
index 9176d28..feabc8b 100644 (file)
--- a/ghc/lib/std/cbits/PrelIOUtils.c
+++ b/ghc/lib/std/cbits/PrelIOUtils.c
@@ -5,6 +5,13 @@
  */
 #include "HsStd.h"
 #include "PrelIOUtils.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <stddef.h>
+
+#ifndef offsetof
+#define offsetof(t, f) ((size_t) &((t *)0)->f)
+#endif
 
 #ifdef _WIN32
 #include <io.h>
@@ -54,7 +61,7 @@ HsInt prel_setmode(HsInt fd, HsBool toBin)
 #ifdef _WIN32
   return setmode(fd,(toBin == HS_BOOL_TRUE) ? _O_BINARY : _O_TEXT);
 #else
-  return EOK;
+  return 0;
 #endif  
 }
 

diff --git a/ghc/lib/std/cbits/dirUtils.c b/ghc/lib/std/cbits/dirUtils.c
index 40c846b..edced70 100644 (file)
--- a/ghc/lib/std/cbits/dirUtils.c
+++ b/ghc/lib/std/cbits/dirUtils.c
@@ -7,7 +7,21 @@
 
 #if defined(mingw32_TARGET_OS)
 #include <windows.h>
-#include <stdlib.h>
+#endif
+
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#ifdef HAVE_STDDEF_H
+# include <stddef.h>
+#endif
+
+#ifdef HAVE_ERRNO_H
+# include <errno.h>
+#endif
+
+#ifndef offsetof
+#define offsetof(t, f) ((size_t) &((t *)0)->f)
 #endif
 
 HsInt
@@ -58,7 +72,7 @@ HsAddr prel_d_name(struct dirent* d)
 HsInt prel_end_of_dir()
 {
 #ifndef mingw32_TARGET_OS
-  return EOK;
+  return 0;
 #else
   return ENOENT;
 #endif