From f618b2fa0a454c0b450d89052fb9320dcae5bef7 Mon Sep 17 00:00:00 2001
From: vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Wed, 20 May 2009 02:12:26 +0000
Subject: [PATCH] rename array name to avoid naming collision.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8340 6f19259b-4bc3-4df7-8a09-765794883524
---
 .../Console/GraphicsConsoleDxe/GraphicsConsole.c       | 10 +++++-----
 MdeModulePkg/Universal/HiiDatabaseDxe/Font.c           |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
index 3d2e3f3f2a..ebc2bf53ee 100644
--- a/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/MdeModulePkg/Universal/Console/GraphicsConsoleDxe/GraphicsConsole.c
@@ -59,7 +59,7 @@ EFI_GUID             mFontPackageListGuid = {0xf5f219d3, 0x7006, 0x4648, {0xac,
 
 CHAR16               mCrLfString[3] = { CHAR_CARRIAGE_RETURN, CHAR_LINEFEED, CHAR_NULL };
 
-EFI_GRAPHICS_OUTPUT_BLT_PIXEL        mEfiColors[16] = {
+EFI_GRAPHICS_OUTPUT_BLT_PIXEL        mGraphicsEfiColors[16] = {
   //
   // B    G    R   reserved
   //
@@ -1258,7 +1258,7 @@ GraphicsConsoleConOutSetMode (
       //
       Status = GraphicsOutput->Blt (
                           GraphicsOutput,
-                          &mEfiColors[0],
+                          &mGraphicsEfiColors[0],
                           EfiBltVideoFill,
                           0,
                           0,
@@ -1303,7 +1303,7 @@ GraphicsConsoleConOutSetMode (
       //
       Status = UgaDraw->Blt (
                           UgaDraw,
-                          (EFI_UGA_PIXEL *) (UINTN) &mEfiColors[0],
+                          (EFI_UGA_PIXEL *) (UINTN) &mGraphicsEfiColors[0],
                           EfiUgaVideoFill,
                           0,
                           0,
@@ -1575,8 +1575,8 @@ GetTextColors (
 
   Attribute   = This->Mode->Attribute & 0x7F;
 
-  *Foreground = mEfiColors[Attribute & 0x0f];
-  *Background = mEfiColors[Attribute >> 4];
+  *Foreground = mGraphicsEfiColors[Attribute & 0x0f];
+  *Background = mGraphicsEfiColors[Attribute >> 4];
 
   return EFI_SUCCESS;
 }
diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
index fa87273259..b899cec360 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Font.c
@@ -2,7 +2,7 @@
 Implementation for EFI_HII_FONT_PROTOCOL.
 
 
-Copyright (c) 2007 - 2008, Intel Corporation
+Copyright (c) 2007 - 2009, Intel Corporation
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -16,7 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 
 #include "HiiDatabase.h"
 
-EFI_GRAPHICS_OUTPUT_BLT_PIXEL        mEfiColors[16] = {
+EFI_GRAPHICS_OUTPUT_BLT_PIXEL        mHiiEfiColors[16] = {
   //
   // B     G     R
   //
@@ -912,8 +912,8 @@ GetSystemFont (
     return EFI_OUT_OF_RESOURCES;
   }
 
-  Info->ForegroundColor    = mEfiColors[Private->Attribute & 0x0f];
-  Info->BackgroundColor    = mEfiColors[Private->Attribute >> 4];
+  Info->ForegroundColor    = mHiiEfiColors[Private->Attribute & 0x0f];
+  Info->BackgroundColor    = mHiiEfiColors[Private->Attribute >> 4];
   Info->FontInfoMask       = EFI_FONT_INFO_SYS_FONT | EFI_FONT_INFO_SYS_SIZE | EFI_FONT_INFO_SYS_STYLE;
   Info->FontInfo.FontStyle = 0;
   Info->FontInfo.FontSize  = EFI_GLYPH_HEIGHT;