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 DAA97940FD0 for ; Wed, 7 Feb 2024 03:41:20 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=XSLEBvuqye0WjYnZc2kj5loKtEI33O9vEkoetECM5gw=; 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=1707277279; v=1; b=KPUfs/VVWd7rKckl4hUmAaM9Jye2IobJziafxjGGEtzJ3729B3tzkdsTMX+J/IGuK0MwE+Xk 4mDooQfkYBdARfgyE+976n0Wi2MS6iNU4SxyEy7i7GiiWcr7SIv+VEQpDdlhW/q209HzoBXKYfy 10LaM3vbwOk8s81tMC+eitfk= X-Received: by 127.0.0.2 with SMTP id ttpUYY7687511xr99Kek7cZh; Tue, 06 Feb 2024 19:41:19 -0800 X-Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.12]) by mx.groups.io with SMTP id smtpd.web10.13160.1707277278891658966 for ; Tue, 06 Feb 2024 19:41:19 -0800 X-IronPort-AV: E=McAfee;i="6600,9927,10976"; a="12258658" X-IronPort-AV: E=Sophos;i="6.05,250,1701158400"; d="scan'208";a="12258658" X-Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 19:41:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,250,1701158400"; d="scan'208";a="1568984" X-Received: from mdkinney-mobl.amr.corp.intel.com ([10.209.93.91]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 19:41:18 -0800 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu Subject: [edk2-devel] [edk2-stable202402][Patch 1/7] MdePkg/Include: Rename _DEBUG() to address name collision Date: Tue, 6 Feb 2024 19:41:00 -0800 Message-Id: <20240207034106.1860-2-michael.d.kinney@intel.com> In-Reply-To: <20240207034106.1860-1-michael.d.kinney@intel.com> References: <20240207034106.1860-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: Ueu4deNmV1O7Gcxw90hCFtXux7686176AA= 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="KPUfs/VV"; 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 collsion occurs with the DebubLib.h internal macro _DEBUG(). Reaname 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 (#115225): https://edk2.groups.io/g/devel/message/115225 Mute This Topic: https://groups.io/mt/104212828/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-