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

diff --git a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
index 0c84833fd83482b3bc0bb60250e5a788cb552612..79f75f68a57e2d3f23fa1ef9cd981f7129dea262 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
+++ b/Nt32Pkg/PlatformBdsDxe/BdsPlatform.c
@@ -27,7 +27,7 @@ Abstract:
 \r
 #include "Generic/Bds.h"\r
 #include "BdsPlatform.h"\r
-#include "Generic/String.h"\r
+#include "Generic/BdsString.h"\r
 #include "Generic/Language.h"\r
 #include "Generic/FrontPage.h"\r
 \r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h b/Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h
new file mode 100644 (file)
index 0000000..b475c37
--- /dev/null
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BdsString.h
@@ -0,0 +1,53 @@
+/*++\r
+\r
+Copyright (c) 2006, Intel Corporation                                                         \r
+All rights reserved. This program and the accompanying materials                          \r
+are licensed and made available under the terms and conditions of the BSD License         \r
+which accompanies this distribution.  The full text of the license may be found at        \r
+http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+Module Name:\r
+\r
+  BdsString.h\r
+\r
+Abstract:\r
+  \r
+  String support\r
+\r
+Revision History\r
+\r
+--*/\r
+\r
+#ifndef _PLATFORMBDS_STRING_H_\r
+#define _PLATFORMBDS_STRING_H_\r
+\r
+//\r
+// String Definition Guid for BDS Platform\r
+//\r
+#define EFI_BDS_PLATFORM_GUID \\r
+  { \\r
+    0x7777E939, 0xD57E, 0x4DCB, {0xA0, 0x8E, 0x64, 0xD7, 0x98, 0x57, 0x1E, 0x0F } \\r
+  }\r
+\r
+EFI_HII_HANDLE    gStringPackHandle;\r
+EFI_HII_PROTOCOL  *Hii;\r
+\r
+CHAR16            *\r
+GetStringById (\r
+  IN  STRING_REF   Id\r
+  );\r
+\r
+EFI_STATUS\r
+InitializeStringSupport (\r
+  VOID\r
+  );\r
+\r
+EFI_STATUS\r
+CallFrontPage (\r
+  VOID\r
+  );\r
+\r
+#endif // _STRING_H_\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h
index b26f811da4f56b5dc50d07d91abaad968cbf8dae..641e39dec292a52fd7eb8f8500f98c125bf86f22 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/BootMngr/BootManager.h
@@ -31,7 +31,7 @@ Revision History
 \r
 #include "Generic/Bds.h"\r
 #include "BdsPlatform.h"\r
-#include "Generic/String.h"\r
+#include "Generic/BdsString.h"\r
 \r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
index 4b4caf2460a64c448921cbb957cc05003e1c2741..804b3790516f710affea4abb7b24a2253d78cb6e 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
@@ -27,7 +27,7 @@ Abstract:
 #include "Bds.h"\r
 #include "BdsPlatform.h"\r
 #include "FrontPage.h"\r
-#include "String.h"\r
+#include "BdsString.h"\r
 \r
 EFI_GUID                    mProcessorSubClass  = EFI_PROCESSOR_SUBCLASS_GUID;\r
 EFI_GUID                    mMemorySubClass     = EFI_MEMORY_SUBCLASS_GUID;\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/Language.c b/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
index b09df3a64645d50a1127dcd02ca3b98901d44b89..01277d7cf49b87572deb15edb13c03d2b5e7b704 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/Language.c
@@ -26,7 +26,7 @@ Revision History
 //\r
 #include "CommonHeader.h"\r
 \r
-#include "String.h"\r
+#include "BdsString.h"\r
 #include "Language.h"\r
 \r
 #define NARROW_GLYPH_NUMBER 8\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c b/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
index 8b1f7be24c856bf3b5e086b860a379c27686170b..21bfe05e030c64199c0b7eee9e71ce62dc8af130 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/MemoryTest.c
@@ -26,7 +26,7 @@ Abstract:
 \r
 #include "bds.h"\r
 #include "BdsPlatform.h"\r
-#include "String.h"\r
+#include "BdsString.h"\r
 \r
 //\r
 // BDS Platform Functions\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/String.c b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
index 51f0cff757712248ba4237271b9138e13cc550ac..dc4ed3b6ea89a3a5e95719f939fc5e8a03136daa 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/String.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/String.c
@@ -27,7 +27,7 @@ Revision History
 #include "CommonHeader.h"\r
 \r
 #include "Bds.h"\r
-#include "String.h"\r
+#include "BdsString.h"\r
 #include "Language.h"\r
 \r
 EFI_GUID      gBdsStringPackGuid = { 0x7bac95d3, 0xddf, 0x42f3, 0x9e, 0x24, 0x7c, 0x64, 0x49, 0x40, 0x37, 0x9a };\r

diff --git a/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf b/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf
index 4a12ba7b6af29279f44c735e693224c4f9150918..d8b6e37822148413b9cd29c78a7bd5d56b05e938 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf
+++ b/Nt32Pkg/PlatformBdsDxe/PlatformBds.inf
@@ -71,7 +71,7 @@
   Generic/Capsules.c\r
   Generic/Strings.uni\r
   Generic/String.c\r
-  Generic/String.h\r
+  Generic/BdsString.h\r
   Generic/Language.c\r
   Generic/Language.h\r
   Generic/FrontPageVfr.Vfr\r

diff --git a/Nt32Pkg/PlatformBdsDxe/PlatformBds.msa b/Nt32Pkg/PlatformBdsDxe/PlatformBds.msa
index 052b1d8ca977223126737e65f566fb19d0f3e773..4e5dea1839dd1e396ba8fef13b892612730b2cd7 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/PlatformBds.msa
+++ b/Nt32Pkg/PlatformBdsDxe/PlatformBds.msa
@@ -94,7 +94,7 @@
     <Filename>Generic/FrontPageVfr.Vfr</Filename>\r
     <Filename>Generic/Language.h</Filename>\r
     <Filename>Generic/Language.c</Filename>\r
-    <Filename>Generic/String.h</Filename>\r
+    <Filename>Generic/BdsString.h</Filename>\r
     <Filename>Generic/String.c</Filename>\r
     <Filename>Generic/Strings.uni</Filename>\r
     <Filename>Generic/Capsules.c</Filename>\r