From 50b16668d70ecedd428e9483510d307aea86f5b0 Mon Sep 17 00:00:00 2001
From: Thomas Faber <thomas.faber@reactos.org>
Date: Tue, 24 Jan 2012 20:57:03 +0000
Subject: [PATCH] [FREELDR] - Do not declare functions without prototypes -
 DPRINT fix - Powered by VS11

svn path=/trunk/; revision=55150
---
 reactos/boot/freeldr/freeldr/debug.c        |  2 +-
 reactos/boot/freeldr/freeldr/include/bget.h | 38 ++++++++-------------
 reactos/boot/freeldr/freeldr/mm/heap.c      |  2 +-
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/reactos/boot/freeldr/freeldr/debug.c b/reactos/boot/freeldr/freeldr/debug.c
index f0bc951a136..987ed78863c 100644
--- a/reactos/boot/freeldr/freeldr/debug.c
+++ b/reactos/boot/freeldr/freeldr/debug.c
@@ -188,7 +188,7 @@ DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length)
 	}
 
 	DebugStartOfLine = FALSE; // We don't want line headers
-	DbgPrint("Dumping buffer at 0x%x with length of %d bytes:\n", Buffer, Length);
+	DbgPrint("Dumping buffer at %p with length of %lu bytes:\n", Buffer, Length);
 
 	for (Idx=0; Idx<Length; )
 	{
diff --git a/reactos/boot/freeldr/freeldr/include/bget.h b/reactos/boot/freeldr/freeldr/include/bget.h
index 0c72d0e55b2..e7e48ffc17c 100644
--- a/reactos/boot/freeldr/freeldr/include/bget.h
+++ b/reactos/boot/freeldr/freeldr/include/bget.h
@@ -4,27 +4,19 @@
 
 */
 
-#ifndef _
-#ifdef PROTOTYPES
-#define  _(x)  x		      /* If compiler knows prototypes */
-#else
-#define  _(x)  ()                     /* It it doesn't */
-#endif /* PROTOTYPES */
-#endif
-
 typedef long bufsize;
-void	bpool	    _((void *buffer, bufsize len));
-void   *bget	    _((bufsize size));
-void   *bgetz	    _((bufsize size));
-void   *bgetr	    _((void *buffer, bufsize newsize));
-void	brel	    _((void *buf));
-void	bectl	    _((int (*compact)(bufsize sizereq, int sequence),
-		       void *(*acquire)(bufsize size),
-		       void (*release)(void *buf), bufsize pool_incr));
-void	bstats	    _((bufsize *curalloc, bufsize *totfree, bufsize *maxfree,
-		       long *nget, long *nrel));
-void	bstatse     _((bufsize *pool_incr, long *npool, long *npget,
-		       long *nprel, long *ndget, long *ndrel));
-void	bufdump     _((void *buf));
-void	bpoold	    _((void *pool, int dumpalloc, int dumpfree));
-int	bpoolv	    _((void *pool));
+void	bpool	    (void *buffer, bufsize len);
+void   *bget	    (bufsize size);
+void   *bgetz	    (bufsize size);
+void   *bgetr	    (void *buffer, bufsize newsize);
+void	brel	    (void *buf);
+void	bectl	    (int (*compact)(bufsize sizereq, int sequence),
+		     void *(*acquire)(bufsize size),
+		     void (*release)(void *buf), bufsize pool_incr);
+void	bstats	    (bufsize *curalloc, bufsize *totfree, bufsize *maxfree,
+		     long *nget, long *nrel);
+void	bstatse     (bufsize *pool_incr, long *npool, long *npget,
+		     long *nprel, long *ndget, long *ndrel);
+void	bufdump     (void *buf);
+void	bpoold	    (void *pool, int dumpalloc, int dumpfree);
+int	bpoolv	    (void *pool);
diff --git a/reactos/boot/freeldr/freeldr/mm/heap.c b/reactos/boot/freeldr/freeldr/mm/heap.c
index 13b0fe3a544..e447546a2fa 100644
--- a/reactos/boot/freeldr/freeldr/mm/heap.c
+++ b/reactos/boot/freeldr/freeldr/mm/heap.c
@@ -42,7 +42,7 @@ VOID MmInitializeHeap(PVOID PageLookupTable)
 	}
 
 	// Initialize BGET
-	bpool(HeapStart << MM_PAGE_SHIFT, PagesNeeded << MM_PAGE_SHIFT);
+	bpool((PVOID)(HeapStart << MM_PAGE_SHIFT), PagesNeeded << MM_PAGE_SHIFT);
 
 	// Mark those pages as used
 	MmMarkPagesInLookupTable(PageLookupTableAddress, HeapStart, PagesNeeded, LoaderOsloaderHeap);