1. Fixed tools_def.template to meet ICC build for IA32

2. Modified some source files to meet ICC build for IA32 and IPF.

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

2 files changed, 25 insertions, 25 deletions

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Service.h b/MdeModulePkg/Universal/PCD/Dxe/Service.h
index 7ff2b99..3d6e3ed 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Service.h
+++ b/MdeModulePkg/Universal/PCD/Dxe/Service.h
@@ -1,14 +1,14 @@
 /** @file

 Private functions used by PCD DXE driver.

 

-Copyright (c) 2006 - 2007, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

-are licensed and made available under the terms and conditions of the BSD License         

-which accompanies this distribution.  The full text of the license may be found at        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006 - 2007, Intel Corporation

+All rights reserved. This program and the accompanying materials

+are licensed and made available under the terms and conditions of the BSD License

+which accompanies this distribution.  The full text of the license may be found at

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 

 Module Name: Service.h

@@ -41,9 +41,9 @@ Module Name: Service.h
 // PCD_DXE_DATABASE_GENTOOL_VERSION is defined in Autogen.h

 // and generated by PCD Database generation tool.

 //

-#if (PCD_SERVICE_DXE_DRIVER_VERSION != PCD_DXE_SERVICE_DRIVER_AUTOGEN_VERSION)

+//#if (PCD_SERVICE_DXE_DRIVER_VERSION != PCD_DXE_SERVICE_DRIVER_AUTOGEN_VERSION)

 //  #error "Please make sure the version of PCD Service DXE Driver and PCD DXE Database Generation Tool matches"

-#endif

+//#endif

 

 //

 // Protocol Interface function declaration.

@@ -395,7 +395,7 @@ ExGetWorker (
   IN CONST EFI_GUID         *Guid,

   IN UINTN                  ExTokenNumber,

   IN UINTN                  GetSize

-  ) 

+  )

 ;

 

 UINT32

@@ -403,7 +403,7 @@ GetSkuEnabledTokenNumber (
   UINT32 LocalTokenNumber,

   UINTN  Size,

   BOOLEAN IsPeiDb

-  ) 

+  )

 ;

 

 EFI_STATUS

@@ -445,7 +445,7 @@ BuildPcdDxeDataBase (
 );

 

 

-UINTN           

+UINTN

 GetExPcdTokenNumber (

   IN CONST EFI_GUID             *Guid,

   IN UINT32                     ExTokenNumber

@@ -454,7 +454,7 @@ GetExPcdTokenNumber (
 

 

 

-EFI_STATUS           

+EFI_STATUS

 ExGetNextTokeNumber (

   IN      CONST EFI_GUID    *Guid,

   IN OUT  UINTN             *TokenNumber,

diff --git a/MdeModulePkg/Universal/PCD/Pei/Service.h b/MdeModulePkg/Universal/PCD/Pei/Service.h
index fcfdda3..eb7a45d 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Service.h
+++ b/MdeModulePkg/Universal/PCD/Pei/Service.h
@@ -1,14 +1,14 @@
 /** @file

 Private functions used by PCD PEIM.

 

-Copyright (c) 2006, Intel Corporation                                                         

-All rights reserved. This program and the accompanying materials                          

-are licensed and made available under the terms and conditions of the BSD License         

-which accompanies this distribution.  The full text of the license may be found at        

-http://opensource.org/licenses/bsd-license.php                                            

-                                                                                          

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+Copyright (c) 2006, Intel Corporation

+All rights reserved. This program and the accompanying materials

+are licensed and made available under the terms and conditions of the BSD License

+which accompanies this distribution.  The full text of the license may be found at

+http://opensource.org/licenses/bsd-license.php

+

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 

 Module Name: Service.h

@@ -41,9 +41,9 @@ Module Name: Service.h
 // PCD_PEI_DATABASE_GENTOOL_VERSION is defined in Autogen.h

 // and generated by PCD Database generation tool.

 //

-#if (PCD_SERVICE_PEIM_VERSION != PCD_PEI_SERVICE_DRIVER_AUTOGEN_VERSION )

+//#if (PCD_SERVICE_PEIM_VERSION != PCD_PEI_SERVICE_DRIVER_AUTOGEN_VERSION )

 //  #error "Please make sure the version of PCD Service PEIM and PCD PEI Database Generation Tool matches"

-#endif

+//#endif

 

 //

 // PPI Interface Implementation Declaration.

@@ -401,7 +401,7 @@ typedef struct {
 } EX_PCD_ENTRY_ATTRIBUTE;

 

 

-UINTN           

+UINTN

 GetExPcdTokenNumber (

   IN CONST EFI_GUID             *Guid,

   IN UINTN                      ExTokenNumber