From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: zhichao.gao@intel.com) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by groups.io with SMTP; Tue, 23 Apr 2019 21:59:02 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 Apr 2019 21:59:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,388,1549958400"; d="scan'208";a="138312311" Received: from fieedk001.ccr.corp.intel.com ([10.239.33.119]) by orsmga006.jf.intel.com with ESMTP; 23 Apr 2019 21:59:00 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Laszlo Ersek , Jian J Wang , Hao Wu , Ray Ni , Star Zeng , Michael D Kinney , Liming Gao , Dandan Bi Subject: [PATCH V2 0/8] Decrease the name collisions Date: Wed, 24 Apr 2019 12:58:19 +0800 Message-Id: <20190424045827.19348-1-zhichao.gao@intel.com> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1740 V1: The DebugLib instances of DebugPortProtocol, ConOut and 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". V2: Abandon v1. Add a 'static' descriptor to the global variables that only used in a single file to minimize the name collisions. This is only for the varable named 'mExitBootServicesEvent'. Cc: Laszlo Ersek Cc: Jian J Wang Cc: Hao Wu Cc: Ray Ni Cc: Star Zeng Cc: Michael D Kinney Cc: Liming Gao Cc: Dandan Bi Zhichao Gao (8): MdePkg/UefiDebugLibConOut: Decrease the name collisions MdePkg/UefiDebugLibDebugPortProtocol: Decrease the name collisions MdePkg/UefiDebugLibStdErr: Decrease the name collisions IntelFrameworkModulePkg: Decrease the name collisions MdeModulePkg/FirmwarePerformanceDxe: Decrease the name collisions IntelFsp2WrapperPkg/FspWrapperNotifyDxe: Decrease the name collisions IntelFrameworkModulePkg: Decrease the name collisions MdeModulePkg/StatusCodeHandlerRuntimeDxe: Decrease the name collisions .../SmmRuntimeDxeSupport.c | 2 +- .../DatahubStatusCodeHandlerDxe/DatahubStatusCodeHandlerDxe.c | 2 +- IntelFsp2WrapperPkg/FspWrapperNotifyDxe/FspWrapperNotifyDxe.c | 2 +- .../FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.c | 2 +- .../RuntimeDxe/StatusCodeHandlerRuntimeDxe.c | 2 +- MdePkg/Library/UefiDebugLibConOut/DebugLibConstructor.c | 4 ++-- .../UefiDebugLibDebugPortProtocol/DebugLibConstructor.c | 4 ++-- MdePkg/Library/UefiDebugLibStdErr/DebugLibConstructor.c | 4 ++-- 8 files changed, 11 insertions(+), 11 deletions(-) -- 2.21.0.windows.1