From 22ce9dc5b94b1a7cecf1527925092db0a5acc3aa Mon Sep 17 00:00:00 2001 From: mdkinney Date: Sat, 6 Dec 2008 01:19:56 +0000 Subject: [PATCH 1/1] Change _CR() to BASE_CR() to follow naming convention git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6886 6f19259b-4bc3-4df7-8a09-765794883524 --- MdePkg/Include/Base.h | 2 +- MdePkg/Include/Library/DebugLib.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MdePkg/Include/Base.h b/MdePkg/Include/Base.h index 4613ea011d..a90a67b98f 100644 --- a/MdePkg/Include/Base.h +++ b/MdePkg/Include/Base.h @@ -274,7 +274,7 @@ typedef CHAR8 *VA_LIST; @return A pointer to the structure from one of it's elements. **/ -#define _CR(Record, TYPE, Field) ((TYPE *) ((CHAR8 *) (Record) - (CHAR8 *) &(((TYPE *) 0)->Field))) +#define BASE_CR(Record, TYPE, Field) ((TYPE *) ((CHAR8 *) (Record) - (CHAR8 *) &(((TYPE *) 0)->Field))) /** Rounds a value up to the next boundary using a specified alignment. diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h index 0c07aab5fb..764bccc87c 100644 --- a/MdePkg/Include/Library/DebugLib.h +++ b/MdePkg/Include/Library/DebugLib.h @@ -438,9 +438,9 @@ DebugClearMemoryEnabled ( @param TestSignature The 32-bit signature value to match. **/ -#define CR(Record, TYPE, Field, TestSignature) \ - (DebugAssertEnabled () && (_CR (Record, TYPE, Field)->Signature != TestSignature)) ? \ - (TYPE *) (_ASSERT (CR has Bad Signature), Record) : \ - _CR (Record, TYPE, Field) +#define CR(Record, TYPE, Field, TestSignature) \ + (DebugAssertEnabled () && (BASE_CR (Record, TYPE, Field)->Signature != TestSignature)) ? \ + (TYPE *) (_ASSERT (CR has Bad Signature), Record) : \ + BASE_CR (Record, TYPE, Field) #endif -- 2.39.2