From 3b1f95cecd6b3e36c4bd279e72d47c4be5db86d5 Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Wed, 5 Oct 2011 08:44:13 +0000
Subject: [PATCH] Merge commit 'bac0f132bfc6b05187701ded5273b9819d8585bb'

svn path=/trunk/; revision=54001
---
 reactos/boot/freeldr/freeldr/mm/heap_new.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/reactos/boot/freeldr/freeldr/mm/heap_new.c b/reactos/boot/freeldr/freeldr/mm/heap_new.c
index 155ce27b9b7..e3a89f22754 100644
--- a/reactos/boot/freeldr/freeldr/mm/heap_new.c
+++ b/reactos/boot/freeldr/freeldr/mm/heap_new.c
@@ -28,13 +28,6 @@ DBG_DEFAULT_CHANNEL(HEAP);
 PVOID FrLdrDefaultHeap;
 PVOID FrLdrTempHeap;
 
-typedef struct _BLOCK_HEADER
-{
-    USHORT Size;
-    USHORT PreviousSize;
-    ULONG Tag;
-} BLOCK_HEADER, *PBLOCK_HEADER;
-
 typedef struct _BLOCK_DATA
 {
     ULONG Flink;
@@ -43,7 +36,9 @@ typedef struct _BLOCK_DATA
 
 typedef struct _HEAP_BLOCK
 {
-    BLOCK_HEADER;
+    USHORT Size;
+    USHORT PreviousSize;
+    ULONG Tag;
     BLOCK_DATA Data[];
 } HEAP_BLOCK, *PHEAP_BLOCK;
 
@@ -369,7 +364,6 @@ HeapFree(
 {
     PHEAP Heap = HeapHandle;
     PHEAP_BLOCK Block, PrevBlock, NextBlock;
-    USHORT PreviousSize = 0;
     ULONGLONG Time = __rdtsc();
     TRACE("HeapFree(%p, %p)\n", HeapHandle, Pointer);
     ASSERT(Tag != 'dnE#');