public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Gao, Zhichao" <zhichao.gao@intel.com>
To: devel@edk2.groups.io
Cc: Michael D Kinney <michael.d.kinney@intel.com>,
	Liming Gao <liming.gao@intel.com>,
	Dandan Bi <dandan.bi@intel.com>
Subject: [PATCH 2/3] MdePkg/UefiDebugLibStdErr: Change the global variable name
Date: Tue, 23 Apr 2019 10:35:06 +0800	[thread overview]
Message-ID: <20190423023507.16952-3-zhichao.gao@intel.com> (raw)
In-Reply-To: <20190423023507.16952-1-zhichao.gao@intel.com>

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


  parent reply	other threads:[~2019-04-23  2:35 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-23  2:35 [PATCH 0/3] MdePkg/DebugLib: Change the global variable name Gao, Zhichao
2019-04-23  2:35 ` [PATCH 1/3] MdePkg/UefiDebugLibConOut: " Gao, Zhichao
2019-04-23  2:35 ` Gao, Zhichao [this message]
2019-04-23  2:35 ` [PATCH 3/3] MdePkg/UefiDebugLibDebugPortProtocol: " Gao, Zhichao
2019-04-23  2:37 ` [edk2-devel] [PATCH 0/3] MdePkg/DebugLib: " Liming Gao
2019-04-23  7:50 ` Philippe Mathieu-Daudé
2019-04-23 14:07 ` Laszlo Ersek
2019-04-24  2:54   ` Gao, Zhichao

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190423023507.16952-3-zhichao.gao@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox