[tkreuzer] 54001: Merge commit 'bac0f132bfc6b05187701ded5273b9819d8585bb'

Author: tkreuzer
Date: Wed Oct  5 08:44:13 2011
New Revision: 54001

URL: http://svn.reactos.org/svn/reactos?rev=54001&view=rev
Log:
Merge commit 'bac0f132bfc6b05187701ded5273b9819d8585bb'

Modified:
    trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c

Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/hea...
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] Wed Oct  5 08:44:13 2011
@@ -28,22 +28,17 @@
 PVOID FrLdrDefaultHeap;
 PVOID FrLdrTempHeap;

-typedef struct _BLOCK_HEADER
+typedef struct _BLOCK_DATA
+{
+    ULONG Flink;
+    ULONG Blink;
+} BLOCK_DATA, *PBLOCK_DATA;
+
+typedef struct _HEAP_BLOCK
 {
     USHORT Size;
     USHORT PreviousSize;
     ULONG Tag;
-} BLOCK_HEADER, *PBLOCK_HEADER;
-
-typedef struct _BLOCK_DATA
-{
-    ULONG Flink;
-    ULONG Blink;
-} BLOCK_DATA, *PBLOCK_DATA;
-
-typedef struct _HEAP_BLOCK
-{
-    BLOCK_HEADER;
     BLOCK_DATA Data[];
 } HEAP_BLOCK, *PHEAP_BLOCK;

@@ -369,7 +364,6 @@
 {
     PHEAP Heap = HeapHandle;
     PHEAP_BLOCK Block, PrevBlock, NextBlock;
-    USHORT PreviousSize = 0;
     ULONGLONG Time = __rdtsc();
     TRACE("HeapFree(%p, %p)\n", HeapHandle, Pointer);
     ASSERT(Tag != 'dnE#');