comparison src/sheap.c @ 1111:184461bc8de4

[xemacs-hg @ 2002-11-18 06:52:23 by ben] warning fixes, etc. * s/cygwin32.h: -fvtable-thunks is obsolete in GCC 3 and generates warnings. * s/mingw32.h: * s/windowsnt.h: Comment fixes. * emodules.h: Fix warnings from redefining symbols. * eval.c: Fix C++ errors -- no automatic casting between function pointers and void *, function declarations inside of functions not allowed. * event-Xt.c (emacs_Xt_enqueue_focus_event): Warning fixes. * fileio.c (Ffile_truename): Warning fixes. Use LOCAL_TO_WIN32_FILE_FORMAT rather than duplicating it. * glyphs-x.c: Fix style. * intl-auto-encap-win32.c: * intl-auto-encap-win32.h: * intl-encap-win32.c: * intl-encap-win32.c (qxeRegConnectRegistry): * syswindows.h (RegConnectRegistry): DdeCreateStringHandle needs to be manual due to new Cygwin bug. * intl-win32.c: wcslen/wcscmp don't seem to exist under G++ 3, Cygwin. * lisp.h: * lisp-union.h: * lisp-disunion.h: * process-unix.c (unix_send_process): Ugh, C needs volatile and C++ must not have volatile. Remove previous volatile hacks, which don't seem to be working any more. * sheap.c (STATIC_HEAP_SLOP): Try to get a working Cygwin build with old unexec. * sheap.c (more_static_core): No NL's in literals allowed. * symbols.c (Fset): Fix C++ errors. * syswindows.h: Fix Cygwin complaints now that some missing structs have been added. aclocal.m4: Disable shared library modules under Cygwin for the moment, since we need some more tricky coding done and I don't have the time right now. configure.in, configure.usage: code-files.el, loadhist.el: Fix warnings. package-get.el: Fix warnings. NOTE: This was already fixed awhile ago, but reverted by Steve Y. Please be careful. postgresql/Makefile.in.in: Removed. Move common stuff into modues/common/Makefile.common. (Also add extraclean target and a couple of other fixes in that file.) postgresql/configure.ac: Extract out common configure stuff into modules/common/configure-{pre,post}.ac. postgresql/postgresql.c: Fix warning. ldap/Makefile.in.in: Removed. Move common stuff into modues/common/Makefile.common. (Also add extraclean target and a couple of other fixes in that file.) ldap/configure.ac: Extract out common configure stuff into modules/common/configure-{pre,post}.ac. common/Makefile.common: Common stuff is here.
author ben
date Mon, 18 Nov 2002 06:53:08 +0000
parents 4a27df428c73
children 6af03f821bbe
comparison
equal deleted inserted replaced
1110:49065a0d2943 1111:184461bc8de4
25 25
26 #include <unistd.h> 26 #include <unistd.h>
27 #include <sheap-adjust.h> 27 #include <sheap-adjust.h>
28 28
29 #define STATIC_HEAP_BASE 0x800000 29 #define STATIC_HEAP_BASE 0x800000
30 #define STATIC_HEAP_SLOP 0xf0000 30 #define STATIC_HEAP_SLOP 0x500000
31 #define STATIC_HEAP_SIZE \ 31 #define STATIC_HEAP_SIZE \
32 (STATIC_HEAP_BASE + SHEAP_ADJUSTMENT + STATIC_HEAP_SLOP) 32 (STATIC_HEAP_BASE + SHEAP_ADJUSTMENT + STATIC_HEAP_SLOP)
33 #define BLOCKSIZE (1<<12) 33 #define BLOCKSIZE (1<<12)
34 #define ALLOC_UNIT (BLOCKSIZE-1) 34 #define ALLOC_UNIT (BLOCKSIZE-1)
35 #define ALLOC_MASK ~((unsigned long)(ALLOC_UNIT)) 35 #define ALLOC_MASK ~((unsigned long)(ALLOC_UNIT))
80 } 80 }
81 else 81 else
82 { 82 {
83 if (static_heap_ptr + size >= static_heap_base + static_heap_size) 83 if (static_heap_ptr + size >= static_heap_base + static_heap_size)
84 { 84 {
85 printf( 85 printf (
86 86 "\nRequested %d bytes, static heap exhausted! base is %p, current ptr\n"
87 "\nRequested %d bytes, static heap exhausted! base is %p, current ptr 87 "is %p. You have exhausted the static heap. \n"
88 is %p. You have exhausted the static heap. 88 "\n"
89 89 "If you are simply trying to compile, remove sheap-adjust.h\n"
90 If you are simply trying to compile, remove sheap-adjust.h 90 "and recompile from the top level. If this doesn't\n"
91 and recompile from the top level. If this doesn't 91 "work then STATIC_HEAP_SLOP (defined in this file) is too small.\n"
92 work then STATIC_HEAP_SLOP (defined in this file) is too small. 92 "\n"
93 93 "If you want to run temacs, change SHEAP_ADJUSTMENT in sheap-adjust.h\n"
94 If you want to run temacs, change SHEAP_ADJUSTMENT in sheap-adjust.h 94 "to 0 or a +ve number. Generally you should *not* try to run temacs\n"
95 to 0 or a +ve number. Generally you should *not* try to run temacs 95 "with a static heap, you should dump first.\n",
96 with a static heap, you should dump first.\n", size, 96 size, static_heap_base, static_heap_ptr);
97 static_heap_base, static_heap_ptr);
98 97
99 exit(-1); 98 exit(-1);
100 return 0; 99 return 0;
101 } 100 }
102 } 101 }