CHAR16 VersionString[1];\r
} EFI_VERSION_SECTION2;\r
\r
-#define IS_SECTION2(SectionHeaderPtr) \\r
- ((UINT32) (*((UINT32 *) ((EFI_COMMON_SECTION_HEADER *) (UINTN) SectionHeaderPtr)->Size) & 0x00ffffff) == 0x00ffffff)\r
-\r
#define SECTION_SIZE(SectionHeaderPtr) \\r
((UINT32) (*((UINT32 *) ((EFI_COMMON_SECTION_HEADER *) (UINTN) SectionHeaderPtr)->Size) & 0x00ffffff))\r
\r
+#define IS_SECTION2(SectionHeaderPtr) \\r
+ (SECTION_SIZE (SectionHeaderPtr) == 0x00ffffff)\r
+\r
#define SECTION2_SIZE(SectionHeaderPtr) \\r
(((EFI_COMMON_SECTION_HEADER2 *) (UINTN) SectionHeaderPtr)->ExtendedSize)\r
\r