From 1cc8ee7861a59532700a6fd1255689576eda0f52 Mon Sep 17 00:00:00 2001
From: xli24 <xli24@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Thu, 25 Jan 2007 06:15:58 +0000
Subject: Partially make EdkModulePkg pass intel IPF compiler with /W4 /WX
 switched on.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2313 6f19259b-4bc3-4df7-8a09-765794883524
---
 EdkModulePkg/Universal/PCD/Dxe/Service.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'EdkModulePkg/Universal/PCD/Dxe/Service.c')

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Service.c b/EdkModulePkg/Universal/PCD/Dxe/Service.c
index 51e16624ef..8ff45d38da 100644
--- a/EdkModulePkg/Universal/PCD/Dxe/Service.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Service.c
@@ -28,7 +28,6 @@ GetWorker (
   )
 {
   UINT32              *LocalTokenNumberTable;
-  UINT16              *SizeTable;
   EFI_GUID            *GuidTable;
   UINT16              *StringTable;
   EFI_GUID            *Guid;
@@ -76,14 +75,11 @@ GetWorker (
   // EBC compiler is very choosy. It may report warning about comparison
   // between UINTN and 0 . So we add 1 in each size of the 
   // comparison.
-  IsPeiDb = (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE;
+  IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE);
 
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : 
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;
 
-  SizeTable              = IsPeiDb ? mPcdDatabase->PeiDb.Init.SizeTable: 
-                                     mPcdDatabase->DxeDb.Init.SizeTable;
-
   TokenNumber            = IsPeiDb ? TokenNumber :
                                      TokenNumber - PEI_LOCAL_TOKEN_NUMBER;
 
@@ -496,7 +492,7 @@ GetSkuEnabledTokenNumber (
 
 
 
-
+STATIC
 VOID
 InvokeCallbackOnSet (
   UINT32            ExTokenNumber,
@@ -597,7 +593,7 @@ SetWorker (
   // EBC compiler is very choosy. It may report warning about comparison
   // between UINTN and 0 . So we add 1 in each size of the 
   // comparison.
-  IsPeiDb = (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE;
+  IsPeiDb = (BOOLEAN) ((TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1) ? TRUE : FALSE);
 
   LocalTokenNumberTable  = IsPeiDb ? mPcdDatabase->PeiDb.Init.LocalTokenNumberTable : 
                                      mPcdDatabase->DxeDb.Init.LocalTokenNumberTable;
@@ -895,7 +891,7 @@ GetExPcdTokenNumber (
 }
 
 
-
+STATIC
 SKU_ID *
 GetSkuIdArray (
   IN    UINTN             LocalTokenNumberTableIdx,
@@ -923,7 +919,7 @@ GetSkuIdArray (
 }
 
 
-
+STATIC
 UINTN
 GetSizeTableIndexA (
   IN UINTN        LocalTokenNumberTableIdx,
@@ -980,7 +976,7 @@ GetSizeTableIndexA (
 
 
 
-
+STATIC
 UINTN
 GetSizeTableIndex (
   IN    UINTN             LocalTokenNumberTableIdx,
-- 
cgit v1.2.3