From 67233c123321be32adb24ea8ed5f2633208d5ed8 Mon Sep 17 00:00:00 2001
From: Olivier Martin <Olivier.Martin@arm.com>
Date: Tue, 7 Jul 2015 15:46:23 +0000
Subject: [PATCH] EmbeddedPkg: Remove duplicated definitions of ZeroGuid

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <Olivier.Martin@arm.com>
Reviewed-by: Ronald Cron <Ronald.Cron@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17863 6f19259b-4bc3-4df7-8a09-765794883524
---
 EmbeddedPkg/Library/EfiFileLib/EfiFileLib.c   | 5 +++--
 EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.c b/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.c
index 448127d93f..4d58c83086 100644
--- a/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.c
+++ b/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.c
@@ -40,7 +40,10 @@ Fv2:         - EFI Firmware VOlume device 2
 #include <Protocol/FirmwareVolume2.h>
 #include <Protocol/LoadFile.h>
 #include <Protocol/FirmwareVolumeBlock.h>
+
 #include <Guid/FileInfo.h>
+#include <Guid/ZeroGuid.h>
+
 #include <Library/BaseLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/DevicePathLib.h>
@@ -57,8 +60,6 @@ Fv2:         - EFI Firmware VOlume device 2
 
 CHAR8 *gCwd = NULL;
 
-CONST EFI_GUID gZeroGuid  = { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } };
-
 #define EFI_OPEN_FILE_GUARD_HEADER  0x4B4D4641
 #define EFI_OPEN_FILE_GUARD_FOOTER  0x444D5A56
 
diff --git a/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf b/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf
index 74360dc80b..b8cb255268 100644
--- a/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf
+++ b/EmbeddedPkg/Library/EfiFileLib/EfiFileLib.inf
@@ -61,3 +61,4 @@
 [Guids]
   gEfiFileInfoGuid
   gEfiFileSystemInfoGuid
+  gZeroGuid
-- 
2.39.2