Update the conflicted function name with UefiLib from CreatePopUp to CreateMultiStrin...

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

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
index 3006d0597d3e5b0ac9aceb465cebc8dceb2484ac..cb45a0b580a9b195f28ff12399deab85e7dd005b 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/InputHandler.c
@@ -92,7 +92,7 @@ ReadString (
   //\r
   // Display prompt for string\r
   //\r
-  CreatePopUp (ScreenSize, 4, &NullCharacter, Prompt, Space, &NullCharacter);\r
+  CreateMultiStringPopUp (ScreenSize, 4, &NullCharacter, Prompt, Space, &NullCharacter);\r
 \r
   gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_BLACK, EFI_LIGHTGRAY));\r
 \r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index bc79a1e2935a8e344fdb992100149837c98c446f..2885ae3950436d8f437b27ff60db8f65433dbd8a 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -919,7 +919,7 @@ CreateSharedPopUp (
 \r
 **/\r
 VOID\r
-CreatePopUp (\r
+CreateMultiStringPopUp (\r
   IN  UINTN                       RequestedWidth,\r
   IN  UINTN                       NumberOfLines,\r
   ...\r

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
index 6842fe9d7a4fceca72a146b8fa9187c097ea3f68..2c144486ddbe2c257cdd06817eedde3aff741caa 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
@@ -363,7 +363,7 @@ UiWaitForSingleEvent (
 \r
 **/\r
 VOID\r
-CreatePopUp (\r
+CreateMultiStringPopUp (\r
   IN  UINTN                       ScreenWidth,\r
   IN  UINTN                       NumberOfLines,\r
   ...\r