--- a/src/sheap.c	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/sheap.c	Mon Aug 13 11:20:41 2007 +0200
@@ -19,12 +19,13 @@
 02111-1307, USA.*/
 
 #include <config.h>
+#include <stdio.h>
 #include "lisp.h"
-
+#include <stddef.h>
 #include <unistd.h>
 #include <sheap-adjust.h>
 
-#define STATIC_HEAP_BASE	0x800000
+#define STATIC_HEAP_BASE	0x600000
 #define STATIC_HEAP_SLOP	0x40000
 #define STATIC_HEAP_SIZE \
 (STATIC_HEAP_BASE + SHEAP_ADJUSTMENT + STATIC_HEAP_SLOP)
@@ -40,7 +41,6 @@
 int 	static_heap_initialized=0;
 int 	static_heap_dumped=0;
 
-void* more_static_core ( ptrdiff_t increment );
 void* more_static_core ( ptrdiff_t increment )
 {
   int size = (int) increment;
@@ -59,7 +59,7 @@
       static_heap_ptr=static_heap_base;
       static_heap_size=STATIC_HEAP_SIZE -
 	(static_heap_base-static_heap_buffer);
-#ifdef CYGWIN
+#ifdef __CYGWIN32__
       sbrk(BLOCKSIZE);		/* force space for fork to work */
 #endif
       static_heap_initialized=1;
@@ -103,7 +103,7 @@
   return result;
 }
 
-static void
+void
 sheap_adjust_h ()
 {
   FILE *stream = fopen ("sheap-adjust.h", "w");
@@ -120,32 +120,3 @@
   fclose (stream);
 }
 
-void report_sheap_usage (int die_if_pure_storage_exceeded);
-void
-report_sheap_usage (int die_if_pure_storage_exceeded)
-{
-  int rc = 0;
-
-  size_t lost = (STATIC_HEAP_BASE + STATIC_HEAP_SLOP + SHEAP_ADJUSTMENT)
-    - (static_heap_ptr - static_heap_buffer);
-  char buf[200];
-  sprintf (buf, "Static heap usage: %ld of %ld",
-               (long) (static_heap_ptr - static_heap_buffer),
-	   (long) (STATIC_HEAP_BASE + STATIC_HEAP_SLOP + SHEAP_ADJUSTMENT));
-
-  if (lost > STATIC_HEAP_SLOP) {
-    sprintf (buf + strlen (buf), " -- %ldk wasted", (long)(lost/1024));
-    if (die_if_pure_storage_exceeded) {
-      sheap_adjust_h();
-      rc = -1;
-    }
-    message ("%s", buf);
-  }
-
-  if (rc < 0) {
-    unlink("SATISFIED");
-    fatal ("Static heap size adjusted, Don't Panic!  I will restart the `make'");
-  }
-}
-
-