REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1740

The DebugLib instances of StdErr use a global variable
"mExitBootServicesEvent" which is in conflict with the
same variable in StatusCodeHandlerRuntimeDxe.inf.
That would cause a build error through GCC5. So change the
name to the "mDebugLibExitBootServicesEvent".

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Dandan Bi <dandan.bi@intel.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
 MdePkg/Library/UefiDebugLibStdErr/DebugLibConstructor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MdePkg/Library/UefiDebugLibStdErr/DebugLibConstructor.c b/MdePkg/Library/UefiDebugLibStdErr/DebugLibConstructor.c
index d4fdfbab55..11b21cf0cc 100644
--- a/MdePkg/Library/UefiDebugLibStdErr/DebugLibConstructor.c
+++ b/MdePkg/Library/UefiDebugLibStdErr/DebugLibConstructor.c
@@ -17,7 +17,7 @@
 //
 BOOLEAN     mPostEBS = FALSE;
 
-EFI_EVENT   mExitBootServicesEvent;
+EFI_EVENT   mDebugLibExitBootServicesEvent;
 
 //
 // Pointer to SystemTable
@@ -70,7 +70,7 @@ DxeDebugLibConstructor(
                                 ExitBootServicesCallback,
                                 NULL,
                                 &gEfiEventExitBootServicesGuid,
-                                &mExitBootServicesEvent
+                                &mDebugLibExitBootServicesEvent
                                 );
 
   return EFI_SUCCESS;
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#39386): https://edk2.groups.io/g/devel/message/39386
Mute This Topic: https://groups.io/mt/31305236/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-