From nobody Mon Feb 9 00:42:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+96115+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96115+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1667949185; cv=none; d=zohomail.com; s=zohoarc; b=WxhhWfmCDjahYJ1cBkKHj8NIh1N8eUqPCHGpSKkUNh9gHJ1UQLXC3k9RR/6GTkjYavATD1mFYTFgZqNejMCY0eLC7LRHc6/HG6cGLvKBxYMfDb2WizZeShwfYA/fiLp6ZTzJsnRxThzfycUyd4JK7IQeiIw8hZn/enL8R5BJYto= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667949185; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=0//E//h2/XW8pBfYOswxmDNNRGCSRobj0A/ARxxk3o4=; b=mS5YnDTk3zxEH2OcedlkRYxS2nA56O3Jarhpia1OJ5Ob5S+rvbG8mtN8+O3NDFbz338cqePgSbtT6KjrysdQnm0Udig21WgPDG2JALa5ekghhH8ol1+L38QvSAZxWIfTS+X+LxtQGRnNmWUSZSGsCDBTtw9rxQdQBstN+zHACDU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96115+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1667949185939122.92576881979187; Tue, 8 Nov 2022 15:13:05 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id VQbvYY1788612xrZ2dfrzflw; Tue, 08 Nov 2022 15:13:05 -0800 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web08.22.1667949182984134989 for ; Tue, 08 Nov 2022 15:13:03 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10525"; a="311990218" X-IronPort-AV: E=Sophos;i="5.96,149,1665471600"; d="scan'208";a="311990218" X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 15:13:00 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10525"; a="636512154" X-IronPort-AV: E=Sophos;i="5.96,149,1665471600"; d="scan'208";a="636512154" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.46.35]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2022 15:12:59 -0800 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu Subject: [edk2-devel] [Patch v3 2/7] MdePkg/Include/Library: Undefine _ASSERT() if already defined Date: Tue, 8 Nov 2022 15:12:47 -0800 Message-Id: <20221108231252.1864-3-michael.d.kinney@intel.com> In-Reply-To: <20221108231252.1864-1-michael.d.kinney@intel.com> References: <20221108231252.1864-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: 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 X-Gm-Message-State: UqpG3WoGFg0Hbm6Fin3Cjkp3x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1667949185; bh=KlmyBSXAMdUKbO0C5GOFMfEj5tABGoSzFh5ITCTPQiA=; h=Cc:Date:From:Reply-To:Subject:To; b=A1mIrrzw3FUFwE6BDSCG84B93Aab8CPdaLdYzvaCqLWLhdmTpZAJmy3iPw5+nDOLtUa FtN/9QDKx7JkGS+jQCvDQ5nvVWDnTRyoSiIjQ3xVssC/AjRdJeFPZycSueiCUZke2TMuu uvAVRr4y6b9g0WzxZSbqkc4i6+WnALmMBmw= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1667949187322100016 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4134 When unit testing is enabled, make sure _ASSERT() is not already defined by the host environment before defining _ASSERT(). This avoids conflicts with VS20xx builds of GoogleTest based unit tests. Cc: Liming Gao Cc: Zhiguang Liu Signed-off-by: Michael D Kinney Reviewed-by: Liming Gao --- MdePkg/Include/Library/DebugLib.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/Deb= ugLib.h index 8d3d08638d73..9110be2f41b3 100644 --- a/MdePkg/Include/Library/DebugLib.h +++ b/MdePkg/Include/Library/DebugLib.h @@ -337,6 +337,9 @@ UnitTestDebugAssert ( IN CONST CHAR8 *Description ); =20 + #if defined (_ASSERT) + #undef _ASSERT + #endif #if defined (__clang__) && defined (__FILE_NAME__) #define _ASSERT(Expression) UnitTestDebugAssert (__FILE_NAME__, DEBUG_LIN= E_NUMBER, DEBUG_EXPRESSION_STRING (Expression)) #else --=20 2.37.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96115): https://edk2.groups.io/g/devel/message/96115 Mute This Topic: https://groups.io/mt/94902391/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-