From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: zhichao.gao@intel.com) Received: from mga01.intel.com (mga01.intel.com []) by groups.io with SMTP; Mon, 22 Apr 2019 19:35:11 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Apr 2019 19:35:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,384,1549958400"; d="scan'208";a="144995746" Received: from fieedk001.ccr.corp.intel.com ([10.239.33.119]) by fmsmga007.fm.intel.com with ESMTP; 22 Apr 2019 19:35:10 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Michael D Kinney , Liming Gao , Dandan Bi Subject: [PATCH 1/3] MdePkg/UefiDebugLibConOut: Change the global variable name Date: Tue, 23 Apr 2019 10:35:05 +0800 Message-Id: <20190423023507.16952-2-zhichao.gao@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 In-Reply-To: <20190423023507.16952-1-zhichao.gao@intel.com> References: <20190423023507.16952-1-zhichao.gao@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1740 The DebugLib instances of ConOut 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 Cc: Liming Gao Cc: Dandan Bi Signed-off-by: Zhichao Gao --- MdePkg/Library/UefiDebugLibConOut/DebugLibConstructor.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MdePkg/Library/UefiDebugLibConOut/DebugLibConstructor.c b/MdePkg/Library/UefiDebugLibConOut/DebugLibConstructor.c index d4fdfbab55..11b21cf0cc 100644 --- a/MdePkg/Library/UefiDebugLibConOut/DebugLibConstructor.c +++ b/MdePkg/Library/UefiDebugLibConOut/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