Fixup the R_MAGIC code.

svn path=/trunk/; revision=28344

diff --git a/reactos/ntoskrnl/mm/rpoolmgr.h b/reactos/ntoskrnl/mm/rpoolmgr.h
index 8b42de6..c864524 100644 (file)
--- a/reactos/ntoskrnl/mm/rpoolmgr.h
+++ b/reactos/ntoskrnl/mm/rpoolmgr.h
@@ -427,12 +427,12 @@ RUsedRedZoneCheck ( PR_POOL pool, PR_USED pUsed, char* Addr, const char* file, i
 
        ASSERT ( Addr >= (char*)pool->UserBase && Addr < ((char*)pool->UserBase + pool->UserSize - 16) );
 #ifdef R_MAGIC
-       if ( pUsed->UsedMagic == MM_PPOOL_FREEMAGIC )
+       if ( pUsed->UsedMagic == R_FREE_MAGIC )
        {
                pUsed->UserSize = 0; // just to keep from confusion, MmpBadBlock() doesn't return...
                RiBadBlock ( pUsed, Addr, "double-free", file, line, 0 );
        }
-       if ( pUsed->UsedMagic != MM_PPOOL_USEDMAGIC )
+       if ( pUsed->UsedMagic != R_USED_MAGIC )
        {
                RiBadBlock ( pUsed, Addr, "bad magic", file, line, 0 );
        }
@@ -650,7 +650,7 @@ RiUsedInit ( PR_USED Block, rulong Tag )
 {
        Block->Status = 1;
        RUsedFillStack ( Block );
-#if R_MAGIC
+#ifdef R_MAGIC
        Block->UsedMagic = R_USED_MAGIC;
 #endif//R_MAGIC
        //ASSERT_SIZE ( Block->Size );
@@ -978,7 +978,7 @@ RPoolQueryTag ( void* Addr )
 {
        PR_USED Block = RBodyToHdr(Addr);
        // TODO FIXME - should we validate params?
-#if R_MAGIC
+#ifdef R_MAGIC
        if ( Block->UsedMagic != R_USED_MAGIC )
                return 0xDEADBEEF;
 #endif//R_MAGIC