1) Sync EdkCompatibilityPkg with EDK 1.04. The changes includes:

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / EdkIIGlueLib / Library / BaseMemoryLib / MemLibGuid.c

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/MemLibGuid.c b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/MemLibGuid.c
index 6a3654c1b7dd414bc52be22c48f92b838a11994a..0b7682c8c9117123d69cc0330435ba7abd99bbdb 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/MemLibGuid.c
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseMemoryLib/MemLibGuid.c
@@ -75,17 +75,12 @@ GlueCompareGuid (
   IN CONST GUID  *Guid2\r
   )\r
 {\r
-  UINT64  LowPartOfGuid1;\r
-  UINT64  LowPartOfGuid2;\r
-  UINT64  HighPartOfGuid1;\r
-  UINT64  HighPartOfGuid2;\r
-\r
-  LowPartOfGuid1  = ReadUnaligned64 ((CONST UINT64*) Guid1);\r
-  LowPartOfGuid2  = ReadUnaligned64 ((CONST UINT64*) Guid2);\r
-  HighPartOfGuid1 = ReadUnaligned64 ((CONST UINT64*) Guid1 + 1);\r
-  HighPartOfGuid2 = ReadUnaligned64 ((CONST UINT64*) Guid2 + 1);\r
-\r
-  return (BOOLEAN) (LowPartOfGuid1 == LowPartOfGuid2 && HighPartOfGuid1 == HighPartOfGuid2);\r
+  return (BOOLEAN)(\r
+           ReadUnaligned64 ((CONST UINT64*)Guid1)\r
+             == ReadUnaligned64 ((CONST UINT64*)Guid2) &&\r
+           ReadUnaligned64 ((CONST UINT64*)Guid1 + 1)\r
+             == ReadUnaligned64 ((CONST UINT64*)Guid2 + 1)\r
+           );\r
 }\r
 \r
 /**\r