[project @ 2000-05-12 13:34:06 by sewardj]

Minor wurbles to make it compile on Cygwin following DietHEPpery.

diff --git a/ghc/interpreter/hugs.c b/ghc/interpreter/hugs.c
index 2e0b208..3decee2 100644 (file)
--- a/ghc/interpreter/hugs.c
+++ b/ghc/interpreter/hugs.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: hugs.c,v $
- * $Revision: 1.71 $
- * $Date: 2000/05/12 11:59:39 $
+ * $Revision: 1.72 $
+ * $Date: 2000/05/12 13:34:06 $
  * ------------------------------------------------------------------------*/
 
 #include <setjmp.h>
@@ -138,7 +138,7 @@ static ConId currentModule_failed = NIL; /* Remember failed module from :r */
 
 #ifdef DIET_HEP
 
-#include "diet_hep.h"
+#include "DietHEP.h"
 
 static int diet_hep_initialised = 0;
 

diff --git a/ghc/interpreter/interface.c b/ghc/interpreter/interface.c
index 13a83e7..0da2db3 100644 (file)
--- a/ghc/interpreter/interface.c
+++ b/ghc/interpreter/interface.c
@@ -7,8 +7,8 @@
  * Hugs version 1.4, December 1997
  *
  * $RCSfile: interface.c,v $
- * $Revision: 1.57 $
- * $Date: 2000/04/27 16:35:29 $
+ * $Revision: 1.58 $
+ * $Date: 2000/05/12 13:34:07 $
  * ------------------------------------------------------------------------*/
 
 #include "hugsbasictypes.h"
@@ -2528,7 +2528,6 @@ Type type; {
       SymX(putMVarzh_fast)            \
       SymX(newMVarzh_fast)            \
       SymX(takeMVarzh_fast)           \
-      SymX(takeMaybeMVarzh_fast)      \
       SymX(catchzh_fast)              \
       SymX(raisezh_fast)              \
       SymX(delayzh_fast)              \
@@ -2644,20 +2643,13 @@ Type type; {
       SymX(__imp__tzname)            \
       SymX(__imp__timezone)          \
       SymX(tzset)                    \
-      Sym(log)                       \
-      Sym(exp)                       \
+      SymX(log)                      \
+      SymX(exp)                      \
       Sym(sqrt)                      \
       Sym(sin)                       \
       Sym(cos)                       \
-      Sym(tan)                       \
-      Sym(asin)                      \
-      Sym(acos)                      \
-      Sym(atan)                      \
-      Sym(sinh)                      \
-      Sym(cosh)                      \
-      Sym(tanh)                      \
-      Sym(pow)                       \
-      Sym(__errno)                   \
+      SymX(pow)                      \
+      SymX(__errno)                  \
       Sym(stat)                      \
       Sym(fstat)                     \
       Sym(gettimeofday)              \
@@ -2668,7 +2660,7 @@ Type type; {
 
 
 #define EXTERN_SYMS_linux            \
-      SymX(__errno_location)          \
+      SymX(__errno_location)         \
       Sym(__xstat)                   \
       Sym(__fxstat)                  \
       Sym(__lxstat)                  \

diff --git a/ghc/interpreter/storage.c b/ghc/interpreter/storage.c
index 9564eb2..3551c2e 100644 (file)
--- a/ghc/interpreter/storage.c
+++ b/ghc/interpreter/storage.c
@@ -9,8 +9,8 @@
  * included in the distribution.
  *
  * $RCSfile: storage.c,v $
- * $Revision: 1.76 $
- * $Date: 2000/05/10 09:02:25 $
+ * $Revision: 1.77 $
+ * $Date: 2000/05/12 13:34:07 $
  * ------------------------------------------------------------------------*/
 
 #include "hugsbasictypes.h"
@@ -20,7 +20,13 @@
 #include "object.h"
 #include <setjmp.h>
 #include "Stg.h"
-#include "Storage.h"      /* for MarkRoot */
+
+/* #include "Storage.h"
+   We'd like to, but Storage.h and storage.h look the same under
+   Cygwin, alas, causing compilation chaos.  So just copy what
+   we need to know, which is ...
+*/
+extern StgClosure* MarkRoot ( StgClosure* );
 
 /*#define DEBUG_SHOWUSE*/