summaryrefslogtreecommitdiff
path: root/MdeModulePkg
diff options
context:
space:
mode:
authorlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>2009-07-07 06:28:42 +0000
committerlgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>2009-07-07 06:28:42 +0000
commit3ebb9bdb9e97b0b45de23d9d5ce33f1818cb7eb5 (patch)
treed7e50d958372eafa4a56b8bc998cdb6fe3829cf7 /MdeModulePkg
parent87a1d7a848c0b8444f86038f182d6bb5694d8578 (diff)
downloadedk2-3ebb9bdb9e97b0b45de23d9d5ce33f1818cb7eb5.zip
edk2-3ebb9bdb9e97b0b45de23d9d5ce33f1818cb7eb5.tar.gz
edk2-3ebb9bdb9e97b0b45de23d9d5ce33f1818cb7eb5.tar.bz2
Update the conflicted function name with UefiLib from CreatePopUp to CreateMultiStringPopUp.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8778 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg')
-rw-r--r--MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c2
-rw-r--r--MdeModulePkg/Universal/SetupBrowserDxe/Ui.c2
-rw-r--r--MdeModulePkg/Universal/SetupBrowserDxe/Ui.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index 3006d05..cb45a0b 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -92,7 +92,7 @@ ReadString (
//
// Display prompt for string
//
- CreatePopUp (ScreenSize, 4, &NullCharacter, Prompt, Space, &NullCharacter);
+ CreateMultiStringPopUp (ScreenSize, 4, &NullCharacter, Prompt, Space, &NullCharacter);
gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_BLACK, EFI_LIGHTGRAY));
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index bc79a1e..2885ae3 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -919,7 +919,7 @@ CreateSharedPopUp (
**/
VOID
-CreatePopUp (
+CreateMultiStringPopUp (
IN UINTN RequestedWidth,
IN UINTN NumberOfLines,
...
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
index 6842fe9..2c14448 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
@@ -363,7 +363,7 @@ UiWaitForSingleEvent (
**/
VOID
-CreatePopUp (
+CreateMultiStringPopUp (
IN UINTN ScreenWidth,
IN UINTN NumberOfLines,
...