Fix more gcc build breaks. One of these was a subtle bug in the code that was caught...

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

diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.c b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
index 974095f2841e462f9bc5a1d320e6b15e0fafc57f..1f6db7a0e7a73b045579f563bbbdded3ee0b5c23 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.c
@@ -493,7 +493,7 @@ PeiPcdGetNextToken (
   BOOLEAN             Found;\r
     \r
   if (Guid == NULL) {\r
-    *TokenNumber++;\r
+    (*TokenNumber)++;\r
 \r
     if (*TokenNumber >= PEI_NEX_TOKEN_NUMBER) {\r
       *TokenNumber = 0;\r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Service.c b/EdkModulePkg/Universal/PCD/Pei/Service.c
index 54d1250fb2a8b179b0f0a492d1273867cba437c0..30595e1323a00ebf0c99f419396b9965bfa82d44 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Pei/Service.c
+++ b/EdkModulePkg/Universal/PCD/Pei/Service.c
@@ -143,7 +143,7 @@ GetHiiVariable (
   VOID       *Buffer;\r
   EFI_PEI_READ_ONLY_VARIABLE_PPI *VariablePpi;\r
 \r
-  Status = PeiCoreLocatePpi (&gEfiPeiReadOnlyVariablePpiGuid, 0, NULL, &VariablePpi);\r
+  Status = PeiCoreLocatePpi (&gEfiPeiReadOnlyVariablePpiGuid, 0, NULL, (VOID **) &VariablePpi);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Size = 0;\r