From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Tue, 14 Apr 2009 01:57:26 +0000 (+0000)
Subject: Fix the conflicted function names to new HII library.
X-Git-Tag: edk2-stable201903~18187
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=cdaf7905478cafef5315b8eaa7b38ab793200789

Fix the conflicted function names to new HII library.

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

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c
index efc205e919..623e832826 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Forms.c
@@ -483,7 +483,7 @@ Done:
 **/
 EFI_STATUS
 EFIAPI
-HiiUpdateForm (
+HiiThunkUpdateForm (
   IN EFI_HII_PROTOCOL                  *This,
   IN FRAMEWORK_EFI_HII_HANDLE          Handle,
   IN EFI_FORM_LABEL                    Label,
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
index a89d91e233..7882227faf 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.c
@@ -34,12 +34,12 @@ HII_THUNK_PRIVATE_DATA mHiiThunkPrivateDataTempate = {
     HiiNewString,
     HiiGetPrimaryLanguages,
     HiiGetSecondaryLanguages,
-    HiiGetString,
+    HiiThunkGetString,
     HiiResetStrings,
     HiiGetLine,
     HiiGetForms,
     HiiGetDefaultImage,
-    HiiUpdateForm,
+    HiiThunkUpdateForm,
     
     HiiGetKeyboardLayout
   },
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
index 3d56a41d77..a1e9c1a4c6 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/HiiDatabase.h
@@ -311,7 +311,7 @@ HiiNewString (
 
 EFI_STATUS
 EFIAPI
-HiiGetString (
+HiiThunkGetString (
   IN     EFI_HII_PROTOCOL           *This,
   IN     FRAMEWORK_EFI_HII_HANDLE   Handle,
   IN     STRING_REF                 Token,
@@ -388,7 +388,7 @@ HiiGetDefaultImage (
 
 EFI_STATUS
 EFIAPI
-HiiUpdateForm (
+HiiThunkUpdateForm (
   IN EFI_HII_PROTOCOL                   *This,
   IN FRAMEWORK_EFI_HII_HANDLE           Handle,
   IN EFI_FORM_LABEL                     Label,
diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c
index 6e966192ac..d9cc39eb8d 100644
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/Strings.c
@@ -378,7 +378,7 @@ HiiResetStrings (
 **/
 EFI_STATUS
 EFIAPI
-HiiGetString (
+HiiThunkGetString (
   IN     EFI_HII_PROTOCOL           *This,
   IN     FRAMEWORK_EFI_HII_HANDLE   Handle,
   IN     STRING_REF                 Token,