Fixed the issues which caused the gcc build on MacOs failed

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

diff --git a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
index 7b48b67d2464c54927421f098ce4454716b52ba5..94c0ded3dfa5b420ff09621c35172f96fe6f43a3 100644 (file)
--- a/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
+++ b/Tools/Source/TianoTools/PeiRebase/PeiRebaseExe.c
@@ -31,6 +31,7 @@ Abstract:
 #include <Common/FirmwareFileSystem.h>\r
 #include <Library/PeCoffLib.h>\r
 \r
 #include <Common/FirmwareFileSystem.h>\r
 #include <Library/PeCoffLib.h>\r
 \r

+#include "CommonLib.h"\r

 #include "ParseInf.h"\r
 #include "FvLib.h"\r
 #include "EfiUtilityMsgs.h"\r
 #include "ParseInf.h"\r
 #include "FvLib.h"\r
 #include "EfiUtilityMsgs.h"\r

diff --git a/Tools/Source/TianoTools/String/String.c b/Tools/Source/TianoTools/String/String.c
index 0e4993a4be429a310a705c913d0e14ee78cff505..1f09dab724e9fbd9d0af4952359c991b7914e2d8 100644 (file)
--- a/Tools/Source/TianoTools/String/String.c
+++ b/Tools/Source/TianoTools/String/String.c
@@ -20,6 +20,64 @@
 \r
 #include "CommonLib.h"\r
 \r
 \r
 #include "CommonLib.h"\r
 \r

+/**\r
+  Returns the length of a Null-terminated Unicode string.\r
+\r
+  This function returns the number of Unicode characters in the Null-terminated\r
+  Unicode string specified by String.\r
+\r
+  If String is NULL, then ASSERT().\r
+\r
+  @param  String  Pointer to a Null-terminated Unicode string.\r
+\r
+  @return The length of String.\r
+\r
+**/\r
+UINTN\r
+EFIAPI\r
+StrLen (\r
+  IN      CONST CHAR16              *String\r
+  )\r
+{\r
+  UINTN                             Length;\r
+\r
+  ASSERT (String != NULL);\r
+\r
+  for (Length = 0; *String != L'\0'; String++, Length++) {\r
+    ;\r
+  }\r
+  return Length;\r
+}\r
+\r
+/**\r
+  Returns the length of a Null-terminated ASCII string.\r
+\r
+  This function returns the number of ASCII characters in the Null-terminated\r
+  ASCII string specified by String.\r
+\r
+  If String is NULL, then ASSERT().\r
+\r
+  @param  String  Pointer to a Null-terminated ASCII string.\r
+\r
+  @return The length of String.\r
+\r
+**/\r
+UINTN\r
+EFIAPI\r
+AsciiStrLen (\r
+  IN      CONST CHAR8               *String\r
+  )\r
+{\r
+  UINTN                             Length;\r
+\r
+  ASSERT (String != NULL);\r
+\r
+  for (Length = 0; *String != '\0'; String++, Length++) {\r
+    ;\r
+  }\r
+  return Length;\r
+}\r
+\r

 /**\r
   Copies one Null-terminated Unicode string to another Null-terminated Unicode\r
   string and returns the new Unicode string.\r
 /**\r
   Copies one Null-terminated Unicode string to another Null-terminated Unicode\r
   string and returns the new Unicode string.\r


@@ -127,35 +185,6 @@ StrnCpy (
   return ReturnValue;\r
 }\r
 \r
   return ReturnValue;\r
 }\r
 \r

-/**\r
-  Returns the length of a Null-terminated Unicode string.\r
-\r
-  This function returns the number of Unicode characters in the Null-terminated\r
-  Unicode string specified by String.\r
-\r
-  If String is NULL, then ASSERT().\r
-\r
-  @param  String  Pointer to a Null-terminated Unicode string.\r
-\r
-  @return The length of String.\r
-\r
-**/\r
-UINTN\r
-EFIAPI\r
-StrLen (\r
-  IN      CONST CHAR16              *String\r
-  )\r
-{\r
-  UINTN                             Length;\r
-\r
-  ASSERT (String != NULL);\r
-\r
-  for (Length = 0; *String != L'\0'; String++, Length++) {\r
-    ;\r
-  }\r
-  return Length;\r
-}\r
-\r

 /**\r
   Returns the size of a Null-terminated Unicode string in bytes, including the\r
   Null terminator.\r
 /**\r
   Returns the size of a Null-terminated Unicode string in bytes, including the\r
   Null terminator.\r


@@ -454,35 +483,6 @@ AsciiStrnCpy (
   return ReturnValue;\r
 }\r
 \r
   return ReturnValue;\r
 }\r
 \r

-/**\r
-  Returns the length of a Null-terminated ASCII string.\r
-\r
-  This function returns the number of ASCII characters in the Null-terminated\r
-  ASCII string specified by String.\r
-\r
-  If String is NULL, then ASSERT().\r
-\r
-  @param  String  Pointer to a Null-terminated ASCII string.\r
-\r
-  @return The length of String.\r
-\r
-**/\r
-UINTN\r
-EFIAPI\r
-AsciiStrLen (\r
-  IN      CONST CHAR8               *String\r
-  )\r
-{\r
-  UINTN                             Length;\r
-\r
-  ASSERT (String != NULL);\r
-\r
-  for (Length = 0; *String != '\0'; String++, Length++) {\r
-    ;\r
-  }\r
-  return Length;\r
-}\r
-\r

 /**\r
   Returns the size of a Null-terminated ASCII string in bytes, including the\r
   Null terminator.\r
 /**\r
   Returns the size of a Null-terminated ASCII string in bytes, including the\r
   Null terminator.\r