X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fsheap.c;h=8c6b1ca454822bacfc8f8e583abba1bdaaa1abdd;hb=b47693946488f82cd1f0132a944dc0c57ac2d653;hp=977addc633e96777333aa7dd0749bbc61ce2c947;hpb=113b194be934327de99a168d809271db252c07c4;p=chise%2Fxemacs-chise.git.1 diff --git a/src/sheap.c b/src/sheap.c index 977addc..8c6b1ca 100644 --- a/src/sheap.c +++ b/src/sheap.c @@ -19,9 +19,8 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.*/ #include -#include #include "lisp.h" -#include + #include #include @@ -41,6 +40,7 @@ unsigned long static_heap_size=STATIC_HEAP_SIZE; 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 @@ void* more_static_core ( ptrdiff_t increment ) static_heap_ptr=static_heap_base; static_heap_size=STATIC_HEAP_SIZE - (static_heap_base-static_heap_buffer); -#ifdef __CYGWIN32__ +#ifdef CYGWIN sbrk(BLOCKSIZE); /* force space for fork to work */ #endif static_heap_initialized=1; @@ -81,17 +81,16 @@ void* more_static_core ( ptrdiff_t increment ) if (static_heap_ptr + size >= static_heap_base + static_heap_size) { printf( - -"\nRequested %d bytes, static heap exhausted! base is %p, current ptr -is %p. You have exhausted the static heap. - -If you are simply trying to compile, remove sheap-adjust.h -and recompile from the top level. If this doesn't -work then STATIC_HEAP_SLOP (defined in this file) is too small. - -If you want to run temacs, change SHEAP_ADJUSTMENT in sheap-adjust.h -to 0 or a +ve number. Generally you should *not* try to run temacs -with a static heap, you should dump first.\n", size, +"\nRequested %d bytes, static heap exhausted! base is %p, current ptr\n" +"is %p. You have exhausted the static heap. \n" +"\n" +"If you are simply trying to compile, remove sheap-adjust.h\n" +"and recompile from the top level. If this doesn't\n" +"work then STATIC_HEAP_SLOP (defined in this file) is too small.\n" +"\n" +"If you want to run temacs, change SHEAP_ADJUSTMENT in sheap-adjust.h\n" +"to 0 or a +ve number. Generally you should *not* try to run temacs\n" +"with a static heap, you should dump first.\n", size, static_heap_base, static_heap_ptr); exit(-1); @@ -120,6 +119,7 @@ sheap_adjust_h () fclose (stream); } +void report_sheap_usage (int die_if_pure_storage_exceeded); void report_sheap_usage (int die_if_pure_storage_exceeded) {