Mercurial > hg > xemacs-beta
diff src/sheap.c @ 5125:b5df3737028a ben-lisp-object
merge
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 24 Feb 2010 01:58:04 -0600 |
parents | 19a72041c5ed |
children | 308d34e9f07d |
line wrap: on
line diff
--- a/src/sheap.c Wed Jan 20 07:05:57 2010 -0600 +++ b/src/sheap.c Wed Feb 24 01:58:04 2010 -0600 @@ -27,7 +27,7 @@ #include <sheap-adjust.h> #define STATIC_HEAP_BASE 0x800000 -#define STATIC_HEAP_SLOP 0x40000 +#define STATIC_HEAP_SLOP 0x80000 #define STATIC_HEAP_SIZE \ (STATIC_HEAP_BASE + SHEAP_ADJUSTMENT + STATIC_HEAP_SLOP) #define BLOCKSIZE (1<<12) @@ -84,7 +84,7 @@ { printf ( "\nRequested %d bytes, static heap exhausted! base is %p, current ptr\n" -"is %p. You have exhausted the static heap. \n" +"is %p, static heap size is %ld. 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" @@ -93,7 +93,7 @@ "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); + size, static_heap_base, static_heap_ptr, static_heap_size); exit(-1); return 0; @@ -111,7 +111,7 @@ if (stream == NULL) report_file_error ("Opening sheap adjustment file", - build_string ("sheap-adjust.h")); + build_ascstring ("sheap-adjust.h")); fprintf (stream, "/*\tDo not edit this file!\n"