Revision: 19355
          http://sourceforge.net/p/edk2/code/19355
Author:   vanjeff
Date:     2015-12-18 05:45:12 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
DuetPkg: Fix GCC error to avoid the duplicated global variables in EfiLdr

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

(Sync patch r19338 from main trunk.)

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <[email protected]>
Reviewed-by: Jeff Fan <[email protected]>

Revision Links:
--------------
    http://sourceforge.net/p/edk2/code/19338

Modified Paths:
--------------
    branches/UDK2015/DuetPkg/EfiLdr/EfiLdr.h
    branches/UDK2015/DuetPkg/EfiLdr/EfiLoader.c

Modified: branches/UDK2015/DuetPkg/EfiLdr/EfiLdr.h
===================================================================
--- branches/UDK2015/DuetPkg/EfiLdr/EfiLdr.h    2015-12-18 05:44:39 UTC (rev 
19354)
+++ branches/UDK2015/DuetPkg/EfiLdr/EfiLdr.h    2015-12-18 05:45:12 UTC (rev 
19355)
@@ -80,9 +80,6 @@
   BIOS_MEMORY_MAP_ENTRY MemoryMapEntry[1];
 } BIOS_MEMORY_MAP;
 
-EFILDR_LOADED_IMAGE    DxeCoreImage;
-EFILDR_LOADED_IMAGE    DxeIplImage;
-
 typedef
 VOID
 (EFIAPI * EFI_MAIN_ENTRYPOINT) (

Modified: branches/UDK2015/DuetPkg/EfiLdr/EfiLoader.c
===================================================================
--- branches/UDK2015/DuetPkg/EfiLdr/EfiLoader.c 2015-12-18 05:44:39 UTC (rev 
19354)
+++ branches/UDK2015/DuetPkg/EfiLdr/EfiLoader.c 2015-12-18 05:45:12 UTC (rev 
19355)
@@ -24,6 +24,9 @@
 #include "PeLoader.h"
 #include "LzmaDecompress.h"
 
+EFILDR_LOADED_IMAGE    DxeCoreImage;
+EFILDR_LOADED_IMAGE    DxeIplImage;
+
 VOID
 SystemHang (
   CHAR8        *Message


------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits

Reply via email to