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

* src/gmalloc.c [CYGWIN]: Adapt to change in sheap.c.

diff --git a/src/ChangeLog b/src/ChangeLog
index 2e1952a098399f6bc0a5657de092895690cf640a..20f9abd3ebfc39c7b48f1d5e9604f7d79c49bd71 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.

diff --git a/src/gmalloc.c b/src/gmalloc.c
index 20ffe5f605fd277bbfaaa7e7c69b4cf3baed1f4a..47046cc6747b382375e9384a74f89c1a5a44af79 100644 (file)
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -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

diff --git a/src/sheap.c b/src/sheap.c
index 2c85dd436351bc2e4f66edd9320a667f04865459..956faa36aa1fd1bf655adcb5f7b48f534217fa97 100644 (file)
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -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;