String.h confuse cl.exe. Its name collide with MS's std library.

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

Nt32Pkg/PlatformBdsDxe/BdsPlatform.c

@@ -27,7 +27,7 @@ Abstract:
 
 #include "Generic/Bds.h"
 #include "BdsPlatform.h"
-#include "Generic/String.h"
+#include "Generic/BdsString.h"
 #include "Generic/Language.h"
 #include "Generic/FrontPage.h"
 

Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h

@@ -0,0 +1,53 @@
+/*++
+
+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:
+
+  BdsString.h
+
+Abstract:
+  
+  String support
+
+Revision History
+
+--*/
+
+#ifndef _PLATFORMBDS_STRING_H_
+#define _PLATFORMBDS_STRING_H_
+
+//
+// String Definition Guid for BDS Platform
+//
+#define EFI_BDS_PLATFORM_GUID \
+  { \
+    0x7777E939, 0xD57E, 0x4DCB, {0xA0, 0x8E, 0x64, 0xD7, 0x98, 0x57, 0x1E, 0x0F } \
+  }
+
+EFI_HII_HANDLE    gStringPackHandle;
+EFI_HII_PROTOCOL  *Hii;
+
+CHAR16            *
+GetStringById (
+  IN  STRING_REF   Id
+  );
+
+EFI_STATUS
+InitializeStringSupport (
+  VOID
+  );
+
+EFI_STATUS
+CallFrontPage (
+  VOID
+  );
+
+#endif // _STRING_H_

Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h

@@ -31,7 +31,7 @@ Revision History
 
 #include "Generic/Bds.h"
 #include "BdsPlatform.h"
-#include "Generic/String.h"
+#include "Generic/BdsString.h"
 
 EFI_STATUS
 EFIAPI

Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c

@@ -27,7 +27,7 @@ Abstract:
 #include "Bds.h"
 #include "BdsPlatform.h"
 #include "FrontPage.h"
-#include "String.h"
+#include "BdsString.h"
 
 EFI_GUID                    mProcessorSubClass  = EFI_PROCESSOR_SUBCLASS_GUID;
 EFI_GUID                    mMemorySubClass     = EFI_MEMORY_SUBCLASS_GUID;

Nt32Pkg/PlatformBdsDxe/Generic/Language.c

@@ -26,7 +26,7 @@ Revision History
 //
 #include "CommonHeader.h"
 
-#include "String.h"
+#include "BdsString.h"
 #include "Language.h"
 
 #define NARROW_GLYPH_NUMBER 8

Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c

@@ -26,7 +26,7 @@ Abstract:
 
 #include "bds.h"
 #include "BdsPlatform.h"
-#include "String.h"
+#include "BdsString.h"
 
 //
 // BDS Platform Functions

Nt32Pkg/PlatformBdsDxe/Generic/String.c

@@ -27,7 +27,7 @@ Revision History
 #include "CommonHeader.h"
 
 #include "Bds.h"
-#include "String.h"
+#include "BdsString.h"
 #include "Language.h"
 
 EFI_GUID      gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, 0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a };

Nt32Pkg/PlatformBdsDxe/PlatformBds.inf

@@ -71,7 +71,7 @@
   Generic/Capsules.c
   Generic/Strings.uni
   Generic/String.c
-  Generic/String.h
+  Generic/BdsString.h
   Generic/Language.c
   Generic/Language.h
   Generic/FrontPageVfr.Vfr

Nt32Pkg/PlatformBdsDxe/PlatformBds.msa

@@ -94,7 +94,7 @@
     <Filename>Generic/FrontPageVfr.Vfr</Filename>
     <Filename>Generic/Language.h</Filename>
     <Filename>Generic/Language.c</Filename>
-    <Filename>Generic/String.h</Filename>
+    <Filename>Generic/BdsString.h</Filename>
     <Filename>Generic/String.c</Filename>
     <Filename>Generic/Strings.uni</Filename>
     <Filename>Generic/Capsules.c</Filename>