From: vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 24 Oct 2008 02:55:01 +0000 (+0000)
Subject: ECC Clean up.
X-Git-Tag: edk2-stable201903~20021
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=43025b293f476685df52c5c15126400acfc09c2a;ds=sidebyside

ECC Clean up.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@6205 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/MdeModulePkg/Core/Dxe/Mem/Page.c b/MdeModulePkg/Core/Dxe/Mem/Page.c
index 33dcc4fc1b..648667eb3c 100644
--- a/MdeModulePkg/Core/Dxe/Mem/Page.c
+++ b/MdeModulePkg/Core/Dxe/Mem/Page.c
@@ -1281,7 +1281,7 @@ CoreGetMemoryMap (
       MemoryMap->Attribute |= EFI_MEMORY_RUNTIME;
     }
 
-    MemoryMap = NextMemoryDescriptor (MemoryMap, Size);
+    MemoryMap = NEXT_MEMORY_DESCRIPTOR (MemoryMap, Size);
   }
 
   for (Link = mGcdMemorySpaceMap.ForwardLink; Link != &mGcdMemorySpaceMap; Link = Link->ForwardLink) {
@@ -1308,7 +1308,7 @@ CoreGetMemoryMap (
           }
         }
 
-        MemoryMap = NextMemoryDescriptor (MemoryMap, Size);
+        MemoryMap = NEXT_MEMORY_DESCRIPTOR (MemoryMap, Size);
       }
     }
   }
diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.c b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
index 6abe54668e..936565e600 100644
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.c
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.c
@@ -181,7 +181,7 @@ RuntimeDriverConvertPointer (
       }
     }
 
-    VirtEntry = NextMemoryDescriptor (VirtEntry, mVirtualMapDescriptorSize);
+    VirtEntry = NEXT_MEMORY_DESCRIPTOR (VirtEntry, mVirtualMapDescriptorSize);
   }
 
   return EFI_NOT_FOUND;
diff --git a/MdePkg/Include/Uefi/UefiSpec.h b/MdePkg/Include/Uefi/UefiSpec.h
index 73b8c014e1..16aef4269b 100644
--- a/MdePkg/Include/Uefi/UefiSpec.h
+++ b/MdePkg/Include/Uefi/UefiSpec.h
@@ -84,8 +84,7 @@ typedef struct {
 ///
 /// Build macros to find next EFI_MEMORY_DESCRIPTOR.
 ///
-#define NextMemoryDescriptor(_Ptr, _Size)   ((EFI_MEMORY_DESCRIPTOR *) (((UINT8 *) (_Ptr)) + (_Size)))
-#define NEXT_MEMORY_DESCRIPTOR(_Ptr, _Size) NextMemoryDescriptor (_Ptr, _Size)
+#define NEXT_MEMORY_DESCRIPTOR(_Ptr, _Size)   ((EFI_MEMORY_DESCRIPTOR *) (((UINT8 *) (_Ptr)) + (_Size)))
 
 ///
 /// Declare forward referenced data structures