[Emacs-diffs] trunk r117248: More minor cleanups in src/w32heap.c.

[Eli Zaretskii]

------------------------------------------------------------
revno: 117248
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Tue 2014-06-03 13:01:08 +0300
message:
  More minor cleanups in src/w32heap.c.
  
   src/w32heap.c (calloc): Don't undef, it is never defined.
   (HEAP_ENTRY_SHIFT): Remove unused macro.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/w32heap.c                  w32heap.c-20091113204419-o5vbwnq5f7feedwu-810

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-03 07:28:07 +0000
+++ b/src/ChangeLog     2014-06-03 10:01:08 +0000
@@ -3,6 +3,8 @@
        * w32heap.c (DUMPED_HEAP_SIZE): Move from w32heap.h.  Don't use
        HEAPSIZE; instead, define separate values for the 32- and 64-bit
        builds.
+       (calloc): Don't undef, it is never defined.
+       (HEAP_ENTRY_SHIFT): Remove unused macro.
 
        * Makefile.in (C_HEAP_SWITCH): Remove.
        (ALL_CFLAGS): Don't use $(C_HEAP_SWITCH).

=== modified file 'src/w32heap.c'
--- a/src/w32heap.c     2014-06-03 07:28:07 +0000
+++ b/src/w32heap.c     2014-06-03 10:01:08 +0000
@@ -122,9 +122,7 @@
 
 static unsigned char dumped_data[DUMPED_HEAP_SIZE];
 
-/* Info for managing our preload heap, which is essentially a fixed size
-   data area in the executable. */
-/* Info for keeping track of our heap. */
+/* Info for keeping track of our dynamic heap used after dumping. */
 unsigned char *data_region_base = NULL;
 unsigned char *data_region_end = NULL;
 static DWORD_PTR committed = 0;
@@ -155,7 +153,9 @@
                   + committed
 
 */
-#define HEAP_ENTRY_SHIFT 3
+
+/* Info for managing our preload heap, which is essentially a fixed size
+   data area in the executable. */
 #define PAGE_SIZE 0x1000
 #define MaxBlockSize (0x80000 - PAGE_SIZE)
 
@@ -296,7 +296,6 @@
 
 #undef malloc
 #undef realloc
-#undef calloc
 #undef free
 
 /* FREEABLE_P checks if the block can be safely freed.  */