From: jljusten <jljusten@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 6 Dec 2010 06:04:38 +0000 (+0000)
Subject: DuetPkg, MdeModulePkg: Fix variable services hang with GCC44 X64
X-Git-Tag: edk2-stable201903~15355
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=e1adae6084df21ca30aae2fa23abbbe30f588b20

DuetPkg, MdeModulePkg: Fix variable services hang with GCC44 X64

The C ellipses parameters are passed to functions differently
by default with GCC 4.4.  To make sure they are properly sent to
VariableGetBestLanguage, we add 'EFIAPI' to this function.

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

diff --git a/DuetPkg/FSVariable/FSVariable.c b/DuetPkg/FSVariable/FSVariable.c
index 70da3907b8..9a50cca72b 100644
--- a/DuetPkg/FSVariable/FSVariable.c
+++ b/DuetPkg/FSVariable/FSVariable.c
@@ -753,6 +753,7 @@ GetLangFromSupportedLangCodes (
 
 **/
 CHAR8 *
+EFIAPI
 VariableGetBestLanguage (
   IN CONST CHAR8  *SupportedLanguages, 
   IN BOOLEAN      Iso639Language,
diff --git a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
index e0cd873f96..cd0023671e 100644
--- a/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
+++ b/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariable.c
@@ -572,6 +572,7 @@ GetLangFromSupportedLangCodes (
 
 **/
 CHAR8 *
+EFIAPI
 VariableGetBestLanguage (
   IN CONST CHAR8  *SupportedLanguages, 
   IN BOOLEAN      Iso639Language,
diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 8123338112..dca3e30370 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -1248,6 +1248,7 @@ GetLangFromSupportedLangCodes (
 
 **/
 CHAR8 *
+EFIAPI
 VariableGetBestLanguage (
   IN CONST CHAR8  *SupportedLanguages, 
   IN BOOLEAN      Iso639Language,