Mercurial > hg > xemacs-beta
changeset 4840:17b3dc5500b0
changes to get old non-pdump dumping on Cygwin to work (sort of)
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Tue, 12 Jan 2010 23:19:13 -0600 |
| parents | 5f1c6ca4d05e |
| children | 3465c3161fea |
| files | src/ChangeLog src/sheap.c src/unexcw.c |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Jan 12 23:16:33 2010 -0600 +++ b/src/ChangeLog Tue Jan 12 23:19:13 2010 -0600 @@ -1,5 +1,13 @@ 2010-01-12 Ben Wing <ben@xemacs.org> + * sheap.c: + * sheap.c (more_static_core): + Increase STATIC_HEAP_SLOP. + Change heap-exhausted error message to mention the computed + static heap size. + + * unexcw.c: Include syswindows.h to avoid compile error. + * file-coding.c (default_query_method): Single = is intended. Rewrite using comma operator to make this clearer and avoid dependency on the value of an enum.
--- a/src/sheap.c Tue Jan 12 23:16:33 2010 -0600 +++ b/src/sheap.c Tue Jan 12 23:19:13 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;