[Emacs-diffs] trunk r117967: Fix implementation of HYBRID_MALLOC on Cygwin.

[Ken Brown]

------------------------------------------------------------
revno: 117967
revision-id: address@hidden
parent: address@hidden
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Sat 2014-09-27 16:58:05 -0400
message:
  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.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/gmalloc.c                  gmalloc.c-20091113204419-o5vbwnq5f7feedwu-1085
  src/sheap.c                    sheap.c-20091113204419-o5vbwnq5f7feedwu-3009

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-09-27 15:52:28 +0000
+++ b/src/ChangeLog     2014-09-27 20:58:05 +0000
@@ -1,3 +1,11 @@
+2014-09-27  Ken Brown  <address@hidden>
+
+       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  <address@hidden>
 
        * keyboard.c (track-mouse): Rename to internal--track-mouse.

=== modified file 'src/gmalloc.c'
--- a/src/gmalloc.c     2014-08-31 02:40:00 +0000
+++ b/src/gmalloc.c     2014-09-27 20:58:05 +0000
@@ -75,11 +75,11 @@
 #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

=== modified file 'src/sheap.c'
--- a/src/sheap.c       2014-08-28 14:48:02 +0000
+++ b/src/sheap.c       2014-09-27 20:58:05 +0000
@@ -44,7 +44,9 @@
 #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;