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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 53353ffc096fd6c13167204a78c1df366f7dd4d2..2e1952a098399f6bc0a5657de092895690cf640a 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2014-09-27  Ken Brown  <kbrown@cornell.edu>
+
+       Fix implementation of HYBRID_MALLOC on Cygwin.
+       * sheap.c (bss_sbrk_buffer_end): Cast to void *.
+       (bss_sbrk_buffer_beg): New variable.  Use it...
+       * gmalloc.c (ALLOCATED_BEFORE_DUMPING) [CYGWIN]: ...here, to fix
+       incorrect definition.
+
 2014-09-27  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * keyboard.c (track-mouse): Rename to internal--track-mouse.

diff --git a/src/gmalloc.c b/src/gmalloc.c
index 2682b07ee47d9196932d036cec7c25bce77d1096..20ffe5f605fd277bbfaaa7e7c69b4cf3baed1f4a 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 char *bss_sbrk_buffer;
-extern char *bss_sbrk_buffer_end;
+extern void *bss_sbrk_buffer_beg;
+extern void *bss_sbrk_buffer_end;
 #define DUMPED bss_sbrk_did_unexec
 #define ALLOCATED_BEFORE_DUMPING(P) \
-  ((char *) (P) < bss_sbrk_buffer_end && (char *) (P) >= bss_sbrk_buffer)
+  ((P) < bss_sbrk_buffer_end && (P) >= bss_sbrk_buffer_beg)
 #endif
 
 #ifdef __cplusplus

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