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 43CC778003C for ; Fri, 9 Feb 2024 18:33:51 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=MO+oWPKrXgyvsw1timrH3hVUzPzaopW7eOO9xxUjdaA=; 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=1707503629; v=1; b=uoLWnHpuV2qew0h9c79hGFV/ugG0o8Fp7rIBB/u/SXrMeYRqqUcOyZRKw5qo/s/MRwxNTiQI TyUf/GpptUvdm28jiAcP1Fdye57OehMf7VU79xfY+XkoWpyzFJFqXaKwJ+D9I8vmbqrgfp7we/z Pv+dBXRSbm804cYH+8ovVAgU= X-Received: by 127.0.0.2 with SMTP id VjYzYY7687511xpU3WarmcXK; Fri, 09 Feb 2024 10:33:49 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) by mx.groups.io with SMTP id smtpd.web10.20021.1707503628985058043 for ; Fri, 09 Feb 2024 10:33:49 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10979"; a="4458801" X-IronPort-AV: E=Sophos;i="6.05,257,1701158400"; d="scan'208";a="4458801" X-Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2024 10:33:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,257,1701158400"; d="scan'208";a="2212136" X-Received: from mdkinney-mobl.amr.corp.intel.com ([10.209.59.192]) by fmviesa008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2024 10:33:49 -0800 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu Subject: [edk2-devel] [edk2-stable202402][Patch V2 1/7] MdePkg/Include: Rename _DEBUG() to address name collision Date: Fri, 9 Feb 2024 10:33:30 -0800 Message-Id: <20240209183336.1777-2-michael.d.kinney@intel.com> In-Reply-To: <20240209183336.1777-1-michael.d.kinney@intel.com> References: <20240209183336.1777-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: Orxa4nSvllxYcVvhSLjo8Wqhx7686176AA= 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=uoLWnHpu; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io When VS20xx host-based unit tests are built with debug libraries a name collision occurs with the DebubLib.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 --- 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 (#115316): https://edk2.groups.io/g/devel/message/115316 Mute This Topic: https://groups.io/mt/104264744/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-