[Emacs-diffs] trunk r117970: * src/sheap.c (bss_sbrk_buffer_beg): Remove redundant variable.

[Ken Brown]

------------------------------------------------------------
revno: 117970
revision-id: address@hidden
parent: address@hidden
committer: Ken Brown <address@hidden>
branch nick: trunk
timestamp: Sun 2014-09-28 18:31:59 -0400
message:
  * src/sheap.c (bss_sbrk_buffer_beg): Remove redundant variable.
  * src/gmalloc.c [CYGWIN]: Adapt to change in sheap.c.
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 20:58:05 +0000
+++ b/src/ChangeLog     2014-09-28 22:31:59 +0000
@@ -1,3 +1,8 @@
+2014-09-28  Ken Brown  <address@hidden>
+
+       * sheap.c (bss_sbrk_buffer_beg): Remove redundant variable.
+       * gmalloc.c [CYGWIN]: Adapt to change in sheap.c.
+
 2014-09-27  Ken Brown  <address@hidden>
 
        Fix implementation of HYBRID_MALLOC on Cygwin.

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

=== modified file 'src/sheap.c'
--- a/src/sheap.c       2014-09-27 20:58:05 +0000
+++ b/src/sheap.c       2014-09-28 22:31:59 +0000
@@ -44,8 +44,7 @@
 #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;