From: bbahnsen <bbahnsen@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Fri, 17 Nov 2006 17:38:32 +0000 (+0000)
Subject: Fix gcc warnings -- please review affected files.
X-Git-Tag: edk2-stable201903~23905
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=0cc82df1ebcd09622a38bb03a40aff49bf5363a7

Fix gcc warnings -- please review affected files.

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

diff --git a/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c b/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c
index 8e4f1126b6..990eec164c 100644
--- a/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c
+++ b/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c
@@ -22,7 +22,9 @@ Abstract:
 
 #include <DxeIpl.h>
 
+#ifndef __GNUC__
 #pragma warning( disable : 4305 )
+#endif
 
 BOOLEAN gInMemory = FALSE;
 
diff --git a/EdkModulePkg/Core/DxeIplX64Peim/x64/VirtualMemory.c b/EdkModulePkg/Core/DxeIplX64Peim/x64/VirtualMemory.c
index 8d343fe052..ef9c3b61ae 100644
--- a/EdkModulePkg/Core/DxeIplX64Peim/x64/VirtualMemory.c
+++ b/EdkModulePkg/Core/DxeIplX64Peim/x64/VirtualMemory.c
@@ -155,6 +155,6 @@ Returns:
        );
   }
 
-  return (EFI_PHYSICAL_ADDRESS) PageMap;
+  return (EFI_PHYSICAL_ADDRESS) (UINTN)PageMap; // FIXME
 }
 
diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c b/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c
index 76ddfa80d4..e9d7500261 100644
--- a/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c
+++ b/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c
@@ -35,9 +35,9 @@ Key:
 // Lib will ASSERT if more FVB devices than this are added to the system.
 //
 STATIC FVB_ENTRY          *mFvbEntry;
-STATIC EFI_EVENT          mFvbVirtualNotifyEvent;
+// STATIC EFI_EVENT          mFvbVirtualNotifyEvent;
 STATIC EFI_EVENT          mFvbRegistration;
-STATIC EFI_EVENT          mEfiFvbVirtualNotifyEvent;
+// STATIC EFI_EVENT          mEfiFvbVirtualNotifyEvent;
 STATIC BOOLEAN            mEfiFvbInitialized        = FALSE;
 STATIC UINTN              mFvbCount;
 
@@ -113,10 +113,10 @@ Returns:
     //
     //  Get the interface pointer and if it's ours, skip it
     //
-    Status = gBS->HandleProtocol (Handle, &gEfiFirmwareVolumeBlockProtocolGuid, &mFvbEntry[UpdateIndex].Fvb);
+    Status = gBS->HandleProtocol (Handle, &gEfiFirmwareVolumeBlockProtocolGuid, (VOID **)&mFvbEntry[UpdateIndex].Fvb);
     ASSERT_EFI_ERROR (Status);
 
-    Status = gBS->HandleProtocol (Handle, &gEfiFvbExtensionProtocolGuid, &mFvbEntry[UpdateIndex].FvbExtension);
+    Status = gBS->HandleProtocol (Handle, &gEfiFvbExtensionProtocolGuid, (VOID **)&mFvbEntry[UpdateIndex].FvbExtension);
     if (Status != EFI_SUCCESS) {
       mFvbEntry[UpdateIndex].FvbExtension = NULL;
     }
diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/x64/x64FtwMisc.c b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/x64/x64FtwMisc.c
index 067bfcf179..d8e3a03fde 100644
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/x64/x64FtwMisc.c
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/x64/x64FtwMisc.c
@@ -30,7 +30,7 @@ Revision History
 //
 #define BOOT_BLOCK_BASE
 
-STATIC
+// STATIC
 EFI_STATUS
 GetSwapState (
   IN EFI_FTW_LITE_DEVICE    *FtwLiteDevice,
@@ -56,7 +56,7 @@ Returns:
   return EFI_SUCCESS;
 }
 
-STATIC
+// STATIC
 EFI_STATUS
 SetSwapState (
   IN EFI_FTW_LITE_DEVICE    *FtwLiteDevice,
diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
index c493c99da9..79bce9d4d8 100644
--- a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
+++ b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
@@ -2108,7 +2108,7 @@ DoDhcpDora (
     // now look for DHCP onlys and a Proxy
     //
     for (Index = 0; Index < NumOffers; ++Index) {
-      INT8  Index2;
+      UINT8  Index2;
 
       //
       // ignore proxies, bootps, non DHCP onlys, and bootable DHCPS