diff options
| author | Ken Brown <kbrown@cornell.edu> | 2014-09-27 16:58:05 -0400 |
|---|---|---|
| committer | Ken Brown <kbrown@cornell.edu> | 2014-09-27 16:58:05 -0400 |
| commit | 6c300919bc93033a6cad137e94bf6b1653428256 (patch) | |
| tree | eb514f9fb001a1da80597532b2eea58fe034ffbd /src/sheap.c | |
| parent | 5551acd251f6ca0adea570a3b3781788fdae6a2a (diff) | |
| download | emacs-6c300919bc93033a6cad137e94bf6b1653428256.tar.gz emacs-6c300919bc93033a6cad137e94bf6b1653428256.tar.bz2 emacs-6c300919bc93033a6cad137e94bf6b1653428256.zip | |
Fix implementation of HYBRID_MALLOC on Cygwin.
* src/sheap.c (bss_sbrk_buffer_end): Cast to void *.
(bss_sbrk_buffer_beg): New variable. Use it...
* src/gmalloc.c (ALLOCATED_BEFORE_DUMPING) [CYGWIN]: ...here, to fix
incorrect definition.
Diffstat (limited to 'src/sheap.c')
| -rw-r--r-- | src/sheap.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/sheap.c b/src/sheap.c index dc34df59556..2c85dd43635 100644 --- a/src/sheap.c +++ b/src/sheap.c @@ -44,7 +44,9 @@ int debug_sheap = 0; #define BLOCKSIZE 4096 char bss_sbrk_buffer[STATIC_HEAP_SIZE]; -char *bss_sbrk_buffer_end = bss_sbrk_buffer + STATIC_HEAP_SIZE; +/* The following two variables are needed in gmalloc.c */ +void *bss_sbrk_buffer_beg = bss_sbrk_buffer; +void *bss_sbrk_buffer_end = bss_sbrk_buffer + STATIC_HEAP_SIZE; char *bss_sbrk_ptr; char *max_bss_sbrk_ptr; int bss_sbrk_did_unexec; |