\r
PcdDb = IsPeiDb ? ((UINT8 *) &mPcdDatabase->PeiDb) : ((UINT8 *) &mPcdDatabase->DxeDb);\r
\r
- StringTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :\r
- mPcdDatabase->DxeDb.Init.StringTable;\r
+ StringTable = (UINT16*) (IsPeiDb ? mPcdDatabase->PeiDb.Init.StringTable :\r
+ mPcdDatabase->DxeDb.Init.StringTable);\r
\r
InternalData = PcdDb + Offset;\r
\r
}\r
}\r
\r
- GuidTable = IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
- mPcdDatabase->DxeDb.Init.GuidTable;\r
+ GuidTable = (EFI_GUID *)(IsPeiDb ? mPcdDatabase->PeiDb.Init.GuidTable :\r
+ mPcdDatabase->DxeDb.Init.GuidTable);\r
\r
VariableHead = (VARIABLE_HEAD *) (PcdDb + Offset);\r
\r