]> git.proxmox.com Git - mirror_edk2.git/commitdiff
MdePkg/Include/Library: Undefine _ASSERT() if already defined
authorMichael D Kinney <michael.d.kinney@intel.com>
Tue, 11 Oct 2022 19:03:48 +0000 (12:03 -0700)
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Fri, 11 Nov 2022 05:46:51 +0000 (05:46 +0000)
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4134

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 <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
MdePkg/Include/Library/DebugLib.h

index 8d3d08638d7372e42b25dad1289d1c3428a3f6f7..9110be2f41b394ab44cf283ee4f2382386b8f4bc 100644 (file)
@@ -337,6 +337,9 @@ UnitTestDebugAssert (
   IN CONST CHAR8  *Description\r
   );\r
 \r
+  #if defined (_ASSERT)\r
+    #undef _ASSERT\r
+  #endif\r
   #if defined (__clang__) && defined (__FILE_NAME__)\r
 #define _ASSERT(Expression)  UnitTestDebugAssert (__FILE_NAME__, DEBUG_LINE_NUMBER, DEBUG_EXPRESSION_STRING (Expression))\r
   #else\r