From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 973FFD8027A for ; Tue, 13 Feb 2024 17:26:19 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=PzWadry5sZ8VSEflttyamezHi700bYcdnkLNyXXRxYQ=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20140610; t=1707845178; v=1; b=P2rcCIoqrVOwocDEVjtmipyvwr4QbChrHyB2phCpSb8qW9noJi+P6MRsXN1hASmA6wcMwMnl bl74VQOX+kTKGHV7JdrZu+2RA9p0vq1C97OjWfBHDpjHpB+RcET8ILBMSUpUKRxU+GKEh5I6SYO 4jiwawwFUApTYv7OAx6WknlI= X-Received: by 127.0.0.2 with SMTP id 37RZYY7687511xrqJ1kLHZJv; Tue, 13 Feb 2024 09:26:18 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.18]) by mx.groups.io with SMTP id smtpd.web11.17844.1707845177295409701 for ; Tue, 13 Feb 2024 09:26:17 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10982"; a="1733179" X-IronPort-AV: E=Sophos;i="6.06,157,1705392000"; d="scan'208";a="1733179" X-Received: from orviesa004.jf.intel.com ([10.64.159.144]) by fmvoesa112.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Feb 2024 09:26:17 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.06,157,1705392000"; d="scan'208";a="7698057" X-Received: from mdkinney-mobl.amr.corp.intel.com ([10.209.108.163]) by orviesa004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Feb 2024 09:26:17 -0800 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu , Leif Lindholm Subject: [edk2-devel] [edk2-stable202402][Patch v4 1/7] MdePkg/Include: Rename _DEBUG() to address name collision Date: Tue, 13 Feb 2024 09:26:06 -0800 Message-Id: <20240213172612.636-2-michael.d.kinney@intel.com> In-Reply-To: <20240213172612.636-1-michael.d.kinney@intel.com> References: <20240213172612.636-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: hqTeMdhepbVNZ9BZrtwsjDqSx7686176AA= Content-Transfer-Encoding: 8bit X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=P2rcCIoq; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none) When VS20xx host-based unit tests are built with debug libraries a name collision occurs with the DebugLib.h internal macro _DEBUG(). Rename this internal macro to _DEBUGLIB_DEBUG() to address the name collision. Cc: Liming Gao Cc: Zhiguang Liu Signed-off-by: Michael D Kinney Reviewed-by: Leif Lindholm --- MdePkg/Include/Library/DebugLib.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h index 40772f2e0f7b..0db3b78ec86d 100644 --- a/MdePkg/Include/Library/DebugLib.h +++ b/MdePkg/Include/Library/DebugLib.h @@ -375,9 +375,9 @@ UnitTestDebugAssert ( DebugPrint (PrintLevel, ##__VA_ARGS__); \ } \ } while (FALSE) -#define _DEBUG(Expression) _DEBUG_PRINT Expression +#define _DEBUGLIB_DEBUG(Expression) _DEBUG_PRINT Expression #else -#define _DEBUG(Expression) DebugPrint Expression +#define _DEBUGLIB_DEBUG(Expression) DebugPrint Expression #endif /** @@ -422,7 +422,7 @@ UnitTestDebugAssert ( #define DEBUG(Expression) \ do { \ if (DebugPrintEnabled ()) { \ - _DEBUG (Expression); \ + _DEBUGLIB_DEBUG (Expression); \ } \ } while (FALSE) #else -- 2.40.1.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#115393): https://edk2.groups.io/g/devel/message/115393 Mute This Topic: https://groups.io/mt/104336758/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-