From 031950dfdc7b1c190e4fbb32fc147b3d51f40266 Mon Sep 17 00:00:00 2001
From: Liming Gao <liming.gao@intel.com>
Date: Fri, 18 Dec 2015 02:28:44 +0000
Subject: [PATCH] DuetPkg: Fix GCC error to avoid the duplicated global
 variables in EfiLdr

Move the global variable definitions into source code instead of head filer.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19338 6f19259b-4bc3-4df7-8a09-765794883524
---
 DuetPkg/EfiLdr/EfiLdr.h    | 3 ---
 DuetPkg/EfiLdr/EfiLoader.c | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/DuetPkg/EfiLdr/EfiLdr.h b/DuetPkg/EfiLdr/EfiLdr.h
index 665f405855..4f21cf3f79 100644
--- a/DuetPkg/EfiLdr/EfiLdr.h
+++ b/DuetPkg/EfiLdr/EfiLdr.h
@@ -80,9 +80,6 @@ typedef struct {
   BIOS_MEMORY_MAP_ENTRY MemoryMapEntry[1];
 } BIOS_MEMORY_MAP;
 
-EFILDR_LOADED_IMAGE    DxeCoreImage;
-EFILDR_LOADED_IMAGE    DxeIplImage;
-
 typedef
 VOID
 (EFIAPI * EFI_MAIN_ENTRYPOINT) (
diff --git a/DuetPkg/EfiLdr/EfiLoader.c b/DuetPkg/EfiLdr/EfiLoader.c
index 6913027650..b23966e5ee 100644
--- a/DuetPkg/EfiLdr/EfiLoader.c
+++ b/DuetPkg/EfiLdr/EfiLoader.c
@@ -24,6 +24,9 @@ Revision History:
 #include "PeLoader.h"
 #include "LzmaDecompress.h"
 
+EFILDR_LOADED_IMAGE    DxeCoreImage;
+EFILDR_LOADED_IMAGE    DxeIplImage;
+
 VOID
 SystemHang (
   CHAR8        *Message