Remove the non-standard definition: GLYPH_WIDTH and GLYPH_HEIGHT. All reference to...

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

diff --git a/MdeModulePkg/Universal/BdsDxe/MemoryTest.c b/MdeModulePkg/Universal/BdsDxe/MemoryTest.c
index 09d3ea33397fa54d0aec98524789d11bde10f220..f9396981cba85f84c36ea09c9b1bf3216f3bf857 100644 (file)
--- a/MdeModulePkg/Universal/BdsDxe/MemoryTest.c
+++ b/MdeModulePkg/Universal/BdsDxe/MemoryTest.c
@@ -127,9 +127,9 @@ Returns:
                           0,\r
                           0,\r
                           0,\r
-                          PosY - GLYPH_HEIGHT - 1,\r
+                          PosY - EFI_GLYPH_HEIGHT - 1,\r
                           SizeOfX,\r
-                          SizeOfY - (PosY - GLYPH_HEIGHT - 1),\r
+                          SizeOfY - (PosY - EFI_GLYPH_HEIGHT - 1),\r
                           SizeOfX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)\r
                           );\r
     } else if (FeaturePcdGet (PcdUgaConsumeSupport)) {\r
@@ -140,9 +140,9 @@ Returns:
                           0,\r
                           0,\r
                           0,\r
-                          PosY - GLYPH_HEIGHT - 1,\r
+                          PosY - EFI_GLYPH_HEIGHT - 1,\r
                           SizeOfX,\r
-                          SizeOfY - (PosY - GLYPH_HEIGHT - 1),\r
+                          SizeOfY - (PosY - EFI_GLYPH_HEIGHT - 1),\r
                           SizeOfX * sizeof (EFI_UGA_PIXEL)\r
                           );\r
     } else {\r
@@ -186,8 +186,8 @@ Returns:
   }\r
 \r
   PrintXY (\r
-    (SizeOfX - StrLen (Title) * GLYPH_WIDTH) / 2,\r
-    PosY - GLYPH_HEIGHT - 1,\r
+    (SizeOfX - StrLen (Title) * EFI_GLYPH_WIDTH) / 2,\r
+    PosY - EFI_GLYPH_HEIGHT - 1,\r
     &TitleForeground,\r
     &TitleBackground,\r
     Title\r