[project @ 1998-12-02 13:17:09 by simonm]

[ghc-hetmet.git] / ghc / compiler / parser / hschooks.c

diff --git a/ghc/compiler/parser/hschooks.c b/ghc/compiler/parser/hschooks.c
index 5f848fe..a2cc2e4 100644 (file)
--- a/ghc/compiler/parser/hschooks.c
+++ b/ghc/compiler/parser/hschooks.c
@@ -3,44 +3,22 @@ These routines customise the error messages
 for various bits of the RTS.  They are linked
 in instead of the defaults.
 */
-#include <stdio.h>
 
-/* Included so as to bring the right prototypes into scope */
+#if __GLASGOW_HASKELL__ >= 400
+#include "Rts.h"
+#else
 #include "rtsdefs.h"
-
-#define W_ unsigned long int
-#define I_ long int
+#endif
 
 #if __GLASGOW_HASKELL__ >= 303
+
 void
 ErrorHdrHook (long fd)
 {
     char msg[]="\n";
     write(fd,msg,1);
 }
-#else
-void
-ErrorHdrHook (FILE *where)
-{
-    fprintf(where, "\n"); /* no "Fail: " */
-}
-#endif
-
-void
-OutOfHeapHook (W_ request_size, W_ heap_size)  /* both in bytes */
-{
-    fprintf(stderr, "GHC's heap exhausted;\nwhile trying to allocate %lu bytes in a %lu-byte heap;\nuse the `-H<size>' option to increase the total heap size.\n",
-       request_size,
-       heap_size);
-}
-
-void
-StackOverflowHook (I_ stack_size)    /* in bytes */
-{
-    fprintf(stderr, "GHC stack-space overflow: current size %ld bytes.\nUse the `-K<size>' option to increase it.\n", stack_size);
-}
 
-#if __GLASGOW_HASKELL__ >= 303
 void
 PatErrorHdrHook (long fd)
 {
@@ -64,7 +42,14 @@ PostTraceHook (long fd)
 #endif
 }
 
-#else
+#else /* pre-3.03 GHC with old IO system */
+
+void
+ErrorHdrHook (FILE *where)
+{
+    fprintf(where, "\n"); /* no "Fail: " */
+}
+
 void
 PatErrorHdrHook (FILE *where)
 {
@@ -82,4 +67,39 @@ PostTraceHook (FILE *where)
 {
     fprintf(where, "\n"); /* not "Trace Off" */
 }
+
+#endif
+
+#if __GLASGOW_HASKELL__ >= 400
+void
+OutOfHeapHook (unsigned long request_size, unsigned long heap_size)
+  /* both in bytes */
+{
+    fprintf(stderr, "GHC's heap exhausted;\nwhile trying to allocate %lu bytes in a %lu-byte heap;\nuse the `-H<size>' option to increase the total heap size.\n",
+       request_size,
+       heap_size);
+}
+
+void
+StackOverflowHook (unsigned long stack_size)    /* in bytes */
+{
+    fprintf(stderr, "GHC stack-space overflow: current size %ld bytes.\nUse the `-K<size>' option to increase it.\n", stack_size);
+}
+
+#else /* GHC < 4.00 */
+
+void
+OutOfHeapHook (W_ request_size, W_ heap_size)  /* both in bytes */
+{
+    fprintf(stderr, "GHC's heap exhausted;\nwhile trying to allocate %lu bytes in a %lu-byte heap;\nuse the `-H<size>' option to increase the total heap size.\n",
+       request_size,
+       heap_size);
+}
+
+void
+StackOverflowHook (I_ stack_size)    /* in bytes */
+{
+    fprintf(stderr, "GHC stack-space overflow: current size %ld bytes.\nUse the `-K<size>' option to increase it.\n", stack_size);
+}
+
 #endif