[project @ 2000-03-23 14:54:20 by sewardj]

Make Hugs compile on Win32 again after recent changes.  Also, rename
prelude.h to hugsbasictypes.h to avoid conflicts with includes/Prelude.h.

diff --git a/ghc/interpreter/codegen.c b/ghc/interpreter/codegen.c
index 375e4af..ba61730 100644 (file)
--- a/ghc/interpreter/codegen.c
+++ b/ghc/interpreter/codegen.c
@@ -9,11 +9,11 @@
  * included in the distribution.
  *
  * $RCSfile: codegen.c,v $
- * $Revision: 1.19 $
- * $Date: 2000/03/22 18:14:22 $
+ * $Revision: 1.20 $
+ * $Date: 2000/03/23 14:54:20 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/compiler.c b/ghc/interpreter/compiler.c
index 53f3708..f6e506e 100644 (file)
--- a/ghc/interpreter/compiler.c
+++ b/ghc/interpreter/compiler.c
@@ -11,11 +11,11 @@
  * included in the distribution.
  *
  * $RCSfile: compiler.c,v $
- * $Revision: 1.23 $
- * $Date: 2000/03/15 23:27:16 $
+ * $Revision: 1.24 $
+ * $Date: 2000/03/23 14:54:20 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/derive.c b/ghc/interpreter/derive.c
index d3d8797..cd83f89 100644 (file)
--- a/ghc/interpreter/derive.c
+++ b/ghc/interpreter/derive.c
@@ -9,11 +9,11 @@
  * included in the distribution.
  *
  * $RCSfile: derive.c,v $
- * $Revision: 1.13 $
- * $Date: 2000/03/13 11:37:16 $
+ * $Revision: 1.14 $
+ * $Date: 2000/03/23 14:54:20 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/dynamic.c b/ghc/interpreter/dynamic.c
index f3a6fc6..1f37491 100644 (file)
--- a/ghc/interpreter/dynamic.c
+++ b/ghc/interpreter/dynamic.c
@@ -9,11 +9,11 @@
  * included in the distribution.
  *
  * $RCSfile: dynamic.c,v $
- * $Revision: 1.14 $
- * $Date: 2000/03/10 20:03:36 $
+ * $Revision: 1.15 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "errors.h"
 #include "connect.h"

diff --git a/ghc/interpreter/free.c b/ghc/interpreter/free.c
index bee9195..9c85523 100644 (file)
--- a/ghc/interpreter/free.c
+++ b/ghc/interpreter/free.c
@@ -9,11 +9,11 @@
  * included in the distribution.
  *
  * $RCSfile: free.c,v $
- * $Revision: 1.10 $
- * $Date: 2000/03/13 11:37:16 $
+ * $Revision: 1.11 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/hugs.c b/ghc/interpreter/hugs.c
index a057b50..7dbdae2 100644 (file)
--- a/ghc/interpreter/hugs.c
+++ b/ghc/interpreter/hugs.c
@@ -9,15 +9,15 @@
  * included in the distribution.
  *
  * $RCSfile: hugs.c,v $
- * $Revision: 1.46 $
- * $Date: 2000/03/22 18:14:22 $
+ * $Revision: 1.47 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
 #include <setjmp.h>
 #include <ctype.h>
 #include <stdio.h>
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/prelude.h b/ghc/interpreter/hugsbasictypes.h
similarity index 98%
rename from ghc/interpreter/prelude.h
rename to ghc/interpreter/hugsbasictypes.h
index 787e1ae..d7c7101 100644 (file)
--- a/ghc/interpreter/prelude.h
+++ b/ghc/interpreter/hugsbasictypes.h
@@ -9,9 +9,9 @@
  * free software under the license in the file "License", which is
  * included in the distribution.
  *
- * $RCSfile: prelude.h,v $
- * $Revision: 1.11 $
- * $Date: 2000/03/22 18:14:23 $
+ * $RCSfile: hugsbasictypes.h,v $
+ * $Revision: 1.1 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
 #define NON_POSIX_SOURCE

diff --git a/ghc/interpreter/input.c b/ghc/interpreter/input.c
index 6dba435..9d5298d 100644 (file)
--- a/ghc/interpreter/input.c
+++ b/ghc/interpreter/input.c
@@ -9,11 +9,11 @@
  * included in the distribution.
  *
  * $RCSfile: input.c,v $
- * $Revision: 1.22 $
- * $Date: 2000/03/22 18:14:22 $
+ * $Revision: 1.23 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/interface.c b/ghc/interpreter/interface.c
index a03c691..c1463d9 100644 (file)
--- a/ghc/interpreter/interface.c
+++ b/ghc/interpreter/interface.c
@@ -7,11 +7,11 @@
  * Hugs version 1.4, December 1997
  *
  * $RCSfile: interface.c,v $
- * $Revision: 1.41 $
- * $Date: 2000/03/23 12:19:22 $
+ * $Revision: 1.42 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"
@@ -2618,9 +2618,9 @@ Type type; {
       Sym(setmode)                   \
       SymX(system)                   \
       SymX(sleep)                    \
-      Sym(__imp__tzname)             \
-      Sym(__imp__timezone)           \
-      Sym(tzset)                     \
+      SymX(__imp__tzname)            \
+      SymX(__imp__timezone)          \
+      SymX(tzset)                    \
       Sym(log)                       \
       Sym(exp)                       \
       Sym(sqrt)                      \

diff --git a/ghc/interpreter/lift.c b/ghc/interpreter/lift.c
index 9150bb5..b41d1f5 100644 (file)
--- a/ghc/interpreter/lift.c
+++ b/ghc/interpreter/lift.c
@@ -12,11 +12,11 @@
  * included in the distribution.
  *
  * $RCSfile: lift.c,v $
- * $Revision: 1.12 $
- * $Date: 2000/03/22 18:14:22 $
+ * $Revision: 1.13 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/link.c b/ghc/interpreter/link.c
index 5ef79e4..98235f3 100644 (file)
--- a/ghc/interpreter/link.c
+++ b/ghc/interpreter/link.c
@@ -9,11 +9,11 @@
  * included in the distribution.
  *
  * $RCSfile: link.c,v $
- * $Revision: 1.53 $
- * $Date: 2000/03/22 18:14:22 $
+ * $Revision: 1.54 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/output.c b/ghc/interpreter/output.c
index ea6a585..ad8b0ff 100644 (file)
--- a/ghc/interpreter/output.c
+++ b/ghc/interpreter/output.c
@@ -10,11 +10,11 @@
  * included in the distribution.
  *
  * $RCSfile: output.c,v $
- * $Revision: 1.16 $
- * $Date: 2000/03/13 11:37:16 $
+ * $Revision: 1.17 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/static.c b/ghc/interpreter/static.c
index 25896a0..e2cf438 100644 (file)
--- a/ghc/interpreter/static.c
+++ b/ghc/interpreter/static.c
@@ -9,11 +9,11 @@
  * included in the distribution.
  *
  * $RCSfile: static.c,v $
- * $Revision: 1.31 $
- * $Date: 2000/03/22 18:14:23 $
+ * $Revision: 1.32 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/stg.c b/ghc/interpreter/stg.c
index 1fb262c..0fd6df1 100644 (file)
--- a/ghc/interpreter/stg.c
+++ b/ghc/interpreter/stg.c
@@ -9,11 +9,11 @@
  * included in the distribution.
  *
  * $RCSfile: stg.c,v $
- * $Revision: 1.14 $
- * $Date: 2000/03/13 11:37:17 $
+ * $Revision: 1.15 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/stgSubst.c b/ghc/interpreter/stgSubst.c
index ac52b59..98b92f1 100644 (file)
--- a/ghc/interpreter/stgSubst.c
+++ b/ghc/interpreter/stgSubst.c
@@ -9,11 +9,11 @@
  * included in the distribution.
  *
  * $RCSfile: stgSubst.c,v $
- * $Revision: 1.7 $
- * $Date: 2000/03/10 20:03:36 $
+ * $Revision: 1.8 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/storage.c b/ghc/interpreter/storage.c
index 67cb4c5..3fb6502 100644 (file)
--- a/ghc/interpreter/storage.c
+++ b/ghc/interpreter/storage.c
@@ -9,11 +9,11 @@
  * included in the distribution.
  *
  * $RCSfile: storage.c,v $
- * $Revision: 1.52 $
- * $Date: 2000/03/22 18:14:23 $
+ * $Revision: 1.53 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/storage.h b/ghc/interpreter/storage.h
index 87dacff..747cbee 100644 (file)
--- a/ghc/interpreter/storage.h
+++ b/ghc/interpreter/storage.h
@@ -10,8 +10,8 @@
  * included in the distribution.
  *
  * $RCSfile: storage.h,v $
- * $Revision: 1.35 $
- * $Date: 2000/03/22 18:14:23 $
+ * $Revision: 1.36 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
 #define DEBUG_STORAGE
@@ -63,7 +63,7 @@ typedef Cell         ConVarId;
  * TAG_PTR_MIN(200)    .. TAG_PTR_MAX(298)            pointer tags
  * TAG_SPEC_MIN(400)   .. TAG_SPEC_MAX(425)           special tags
  * OFF_MIN(1,000)      .. OFF_MAX(1,999)              offsets
- * CHAR_MIN(3,000)     .. CHAR_MAX(3,255)             chars
+ * CHARR_MIN(3,000)    .. CHARR_MAX(3,255)            chars
  *
  * SMALL_INT_MIN(100,000) .. SMALL_INT_MAX(499,999)   smallish ints
  *              (300,000 denotes 0)
@@ -889,11 +889,11 @@ extern Class findQualClassWithoutConsultingExportList ( QualId q );
  * ------------------------------------------------------------------------*/
 
 /* I think this assumes that NUM_CHARS==256. */
-#define CHAR_MIN     3000
-#define CHAR_MAX     3255
-#define isChar(c)    (CHAR_MIN<=(c) && (c)<=CHAR_MAX)
-#define charOf(c)    ((Char)((c)-CHAR_MIN))
-#define mkChar(c)    (CHAR_MIN+(((Cell)(c)) & 0xFF))
+#define CHARR_MIN    3000
+#define CHARR_MAX    3255
+#define isChar(c)    (CHARR_MIN<=(c) && (c)<=CHARR_MAX)
+#define charOf(c)    ((Char)((c)-CHARR_MIN))
+#define mkChar(c)    (CHARR_MIN+(((Cell)(c)) & 0xFF))
 #define MAXCHARVAL   (NUM_CHARS-1)
 
 /* --------------------------------------------------------------------------

diff --git a/ghc/interpreter/subst.c b/ghc/interpreter/subst.c
index 198ab27..812a31c 100644 (file)
--- a/ghc/interpreter/subst.c
+++ b/ghc/interpreter/subst.c
@@ -10,11 +10,11 @@
  * included in the distribution.
  *
  * $RCSfile: subst.c,v $
- * $Revision: 1.16 $
- * $Date: 2000/03/22 18:14:23 $
+ * $Revision: 1.17 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/translate.c b/ghc/interpreter/translate.c
index f8863d4..aa0af80 100644 (file)
--- a/ghc/interpreter/translate.c
+++ b/ghc/interpreter/translate.c
@@ -10,11 +10,11 @@
  * included in the distribution.
  *
  * $RCSfile: translate.c,v $
- * $Revision: 1.29 $
- * $Date: 2000/03/13 14:11:14 $
+ * $Revision: 1.30 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"

diff --git a/ghc/interpreter/type.c b/ghc/interpreter/type.c
index 9b60662..3daf1d4 100644 (file)
--- a/ghc/interpreter/type.c
+++ b/ghc/interpreter/type.c
@@ -9,11 +9,11 @@
  * included in the distribution.
  *
  * $RCSfile: type.c,v $
- * $Revision: 1.30 $
- * $Date: 2000/03/13 11:37:17 $
+ * $Revision: 1.31 $
+ * $Date: 2000/03/23 14:54:21 $
  * ------------------------------------------------------------------------*/
 
-#include "prelude.h"
+#include "hugsbasictypes.h"
 #include "storage.h"
 #include "connect.h"
 #include "errors.h"