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 8e4f1126b69c1121822af0a14ef741003b3a69c5..990eec164cb81a982bf4dea6961b69a9f2d9fa0d 100644 (file)
--- a/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c
+++ b/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c
@@ -22,7 +22,9 @@ Abstract:
 \r
 #include <DxeIpl.h>\r
 \r
+#ifndef __GNUC__\r
 #pragma warning( disable : 4305 )\r
+#endif\r
 \r
 BOOLEAN gInMemory = FALSE;\r
 \r

diff --git a/EdkModulePkg/Core/DxeIplX64Peim/x64/VirtualMemory.c b/EdkModulePkg/Core/DxeIplX64Peim/x64/VirtualMemory.c
index 8d343fe05284a0736fafd7a312f9f693adc84b37..ef9c3b61ae86badec77ed295c8099984678933f3 100644 (file)
--- a/EdkModulePkg/Core/DxeIplX64Peim/x64/VirtualMemory.c
+++ b/EdkModulePkg/Core/DxeIplX64Peim/x64/VirtualMemory.c
@@ -155,6 +155,6 @@ Returns:
        );\r
   }\r
 \r
-  return (EFI_PHYSICAL_ADDRESS) PageMap;\r
+  return (EFI_PHYSICAL_ADDRESS) (UINTN)PageMap; // FIXME\r
 }\r
 \r

diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c b/EdkModulePkg/Library/EdkFvbServiceLib/x64/Fvb.c
index 76ddfa80d42834cbffefecd9943f171ba353cc93..e9d7500261a2183f22e1c84b3803a353acdc3478 100644 (file)
--- 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.\r
 //\r
 STATIC FVB_ENTRY          *mFvbEntry;\r
-STATIC EFI_EVENT          mFvbVirtualNotifyEvent;\r
+// STATIC EFI_EVENT          mFvbVirtualNotifyEvent;\r
 STATIC EFI_EVENT          mFvbRegistration;\r
-STATIC EFI_EVENT          mEfiFvbVirtualNotifyEvent;\r
+// STATIC EFI_EVENT          mEfiFvbVirtualNotifyEvent;\r
 STATIC BOOLEAN            mEfiFvbInitialized        = FALSE;\r
 STATIC UINTN              mFvbCount;\r
 \r
@@ -113,10 +113,10 @@ Returns:
     //\r
     //  Get the interface pointer and if it's ours, skip it\r
     //\r
-    Status = gBS->HandleProtocol (Handle, &gEfiFirmwareVolumeBlockProtocolGuid, &mFvbEntry[UpdateIndex].Fvb);\r
+    Status = gBS->HandleProtocol (Handle, &gEfiFirmwareVolumeBlockProtocolGuid, (VOID **)&mFvbEntry[UpdateIndex].Fvb);\r
     ASSERT_EFI_ERROR (Status);\r
 \r
-    Status = gBS->HandleProtocol (Handle, &gEfiFvbExtensionProtocolGuid, &mFvbEntry[UpdateIndex].FvbExtension);\r
+    Status = gBS->HandleProtocol (Handle, &gEfiFvbExtensionProtocolGuid, (VOID **)&mFvbEntry[UpdateIndex].FvbExtension);\r
     if (Status != EFI_SUCCESS) {\r
       mFvbEntry[UpdateIndex].FvbExtension = NULL;\r
     }\r

diff --git a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/x64/x64FtwMisc.c b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/x64/x64FtwMisc.c
index 067bfcf17951dc6e78586967543e56cb7049f7b4..d8e3a03fdefc776c3151862dab9813ff8f1ea70a 100644 (file)
--- a/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/x64/x64FtwMisc.c
+++ b/EdkModulePkg/Universal/FirmwareVolume/FaultTolerantWriteLite/Dxe/x64/x64FtwMisc.c
@@ -30,7 +30,7 @@ Revision History
 //\r
 #define BOOT_BLOCK_BASE\r
 \r
-STATIC\r
+// STATIC\r
 EFI_STATUS\r
 GetSwapState (\r
   IN EFI_FTW_LITE_DEVICE    *FtwLiteDevice,\r
@@ -56,7 +56,7 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
+// STATIC\r
 EFI_STATUS\r
 SetSwapState (\r
   IN EFI_FTW_LITE_DEVICE    *FtwLiteDevice,\r

diff --git a/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c b/EdkModulePkg/Universal/Network/PxeBc/Dxe/pxe_bc_dhcp.c
index c493c99da905976366c089916f92bd832df73f9d..79bce9d4d8a76eacb2f532c8af00b939940c28be 100644 (file)
--- 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\r
     //\r
     for (Index = 0; Index < NumOffers; ++Index) {\r
-      INT8  Index2;\r
+      UINT8  Index2;\r
 \r
       //\r
       // ignore proxies, bootps, non DHCP onlys, and bootable DHCPS\r