procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* src/sheap.c (bss_sbrk_buffer_beg): Remove redundant variable.

Browse source 
* src/gmalloc.c [CYGWIN]: Adapt to change in sheap.c.
This commit is contained in:
Ken Brown 2014-09-28 18:31:59 -04:00
parent 3ff1c9a8ea
commit c3301e3c7f
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2014-09-28 Ken Brown <kbrown@cornell.edu>
* sheap.c (bss_sbrk_buffer_beg): Remove redundant variable.
* gmalloc.c [CYGWIN]: Adapt to change in sheap.c.
2014-09-27 Ken Brown <kbrown@cornell.edu>
Fix implementation of HYBRID_MALLOC on Cygwin.

4
src/gmalloc.c
View file

@ -75,11 +75,11 @@ extern void emacs_abort (void);
#ifdef CYGWIN
extern void *bss_sbrk (ptrdiff_t size);
extern int bss_sbrk_did_unexec;
extern void *bss_sbrk_buffer_beg;
extern char bss_sbrk_buffer[];
extern void *bss_sbrk_buffer_end;
#define DUMPED bss_sbrk_did_unexec
#define ALLOCATED_BEFORE_DUMPING(P) \
((P) < bss_sbrk_buffer_end && (P) >= bss_sbrk_buffer_beg)
((P) < bss_sbrk_buffer_end && (P) >= (void *) bss_sbrk_buffer)
#endif
#ifdef __cplusplus

3
src/sheap.c
View file

@ -44,8 +44,7 @@ int debug_sheap = 0;
#define BLOCKSIZE 4096
char bss_sbrk_buffer[STATIC_HEAP_SIZE];
/* The following two variables are needed in gmalloc.c */
void *bss_sbrk_buffer_beg = bss_sbrk_buffer;
/* The following is needed in gmalloc.c */
void *bss_sbrk_buffer_end = bss_sbrk_buffer + STATIC_HEAP_SIZE;
char *bss_sbrk_ptr;
char *max_bss_sbrk_ptr;