Fix bundle of issue for ICC build

[mirror_edk2.git] / DuetPkg / EfiLdr / PeLoader.c

diff --git a/DuetPkg/EfiLdr/PeLoader.c b/DuetPkg/EfiLdr/PeLoader.c
index e5b6d931469e32623b95d021c1fe20b7e9c64e0d..c4cbbe34c4a1ac6196d8c098a43596037f3868cf 100644 (file)
--- a/DuetPkg/EfiLdr/PeLoader.c
+++ b/DuetPkg/EfiLdr/PeLoader.c
@@ -21,7 +21,6 @@ Revision History:
 #include "Debug.h"\r
 #include "Support.h"\r
 \r
-STATIC\r
 EFI_STATUS\r
 EfiLdrPeCoffLoadPeRelocate (\r
   IN EFILDR_LOADED_IMAGE      *Image,\r
@@ -31,7 +30,6 @@ EfiLdrPeCoffLoadPeRelocate (
   IN EFI_MEMORY_DESCRIPTOR    *EfiMemoryDescriptor\r
   );\r
 \r
-STATIC\r
 EFI_STATUS\r
 EfiLdrPeCoffImageRead (\r
     IN VOID                 *FHand,\r
@@ -40,7 +38,6 @@ EfiLdrPeCoffImageRead (
     OUT VOID                *Buffer\r
     );\r
 \r
-STATIC\r
 VOID *\r
 EfiLdrPeCoffImageAddress (\r
   IN EFILDR_LOADED_IMAGE     *Image,\r
@@ -404,7 +401,6 @@ PrintHeader ('M');
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EfiLdrPeCoffLoadPeRelocate (\r
   IN EFILDR_LOADED_IMAGE      *Image,\r
@@ -481,7 +477,7 @@ PrintHeader ('P');
 \r
       case EFI_IMAGE_REL_BASED_LOW:\r
         F16 = (UINT16 *) Fixup;\r
-        *F16 = *F16 + (UINT16) Adjust;\r
+        *F16 = (UINT16) (*F16 + (UINT16) Adjust);\r
         if (FixupData != NULL) {\r
           *(UINT16 *) FixupData = *F16;\r
           FixupData = FixupData + sizeof(UINT16);\r
@@ -537,7 +533,6 @@ PrintHeader ('Q');
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EfiLdrPeCoffImageRead (\r
   IN VOID                 *FHand,\r
@@ -551,7 +546,6 @@ EfiLdrPeCoffImageRead (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 VOID *\r
 EfiLdrPeCoffImageAddress (\r
   IN EFILDR_LOADED_IMAGE     *Image,\r
@@ -624,19 +618,19 @@ EfiLdrPeCoffCheckImageMachineType (
 \r
   Status = EFI_UNSUPPORTED;\r
 \r
-#if EFI32\r
+#ifdef EFI32\r
   if (MachineType == EFI_IMAGE_MACHINE_IA32) {\r
     Status = EFI_SUCCESS;\r
   }\r
 #endif\r
 \r
-#if EFIX64\r
+#ifdef EFIX64\r
   if (MachineType == EFI_IMAGE_MACHINE_X64) {\r
     Status = EFI_SUCCESS;\r
   }\r
 #endif\r
 \r
-#if EFI64\r
+#ifdef EFI64\r
   if (MachineType == EFI_IMAGE_MACHINE_IA64) {\r
     Status = EFI_SUCCESS;\r
   }\r