; Avoid compiler warnings in the MS-Windows build

* src/w32heap.c: Remove unused variables, to avoid compilation
warnings.  This removes variables that were used only in the
unexec build.

(cherry picked from commit 22ab03e155adc4df0623e3ee9c2cc56a228e148a)

diff --git a/src/w32heap.c b/src/w32heap.c
index 2ba36f0175140a39c7b05f6867fbd4366d12528a..f767e5781bf922c2de70f7a02a631a33e417be08 100644 (file)
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -89,51 +89,6 @@ typedef struct _RTL_HEAP_PARAMETERS {
 /* 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;
-
-/* The maximum block size that can be handled by a non-growable w32
-   heap is limited by the MaxBlockSize value below.
-
-   This point deserves an explanation.
-
-   The W32 heap allocator can be used for a growable heap or a
-   non-growable one.
-
-   A growable heap is not compatible with a fixed base address for the
-   heap.  Only a non-growable one is.  One drawback of non-growable
-   heaps is that they can hold only objects smaller than a certain
-   size (the one defined below).  Most of the larger blocks are GC'ed
-   before dumping.  In any case, and to be safe, we implement a simple
-   first-fit allocation algorithm starting at the end of the
-   dumped_data[] array as depicted below:
-
-  ----------------------------------------------
-  |               |              |             |
-  | Private heap  |->          <-|  Big chunks |
-  |               |              |             |
-  ----------------------------------------------
-  ^               ^              ^
-  dumped_data     dumped_data    bc_limit
-                  + committed
-
-*/
-
-/* 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)
-
-#define MAX_BLOCKS 0x40
-
-static struct
-{
-  unsigned char *address;
-  size_t size;
-  DWORD occupied;
-} blocks[MAX_BLOCKS];
-
-static DWORD          blocks_number = 0;
-static unsigned char *bc_limit;
 
 /* Handle for the private heap:
     - inside the dumped_data[] array before dump with unexec,