summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael D Kinney <michael.d.kinney@intel.com>2024-02-02 17:02:41 -0800
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2024-02-14 02:37:16 +0000
commitded41a64bd5c6bc40283bf5bd07b18bae5cbcd09 (patch)
tree533209c4ac6d28fff14d44c534c3130e6320b679
parent8801c75b4d77c2e6e06b3ddc8560e0db590f6342 (diff)
downloadedk2-ded41a64bd5c6bc40283bf5bd07b18bae5cbcd09.tar.gz
edk2-ded41a64bd5c6bc40283bf5bd07b18bae5cbcd09.tar.bz2
edk2-ded41a64bd5c6bc40283bf5bd07b18bae5cbcd09.zip
MdePkg/Include: Rename _DEBUG() to address name collision
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4683 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 <gaoliming@byosoft.com.cn> Cc: Zhiguang Liu <zhiguang.liu@intel.com> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com> Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
-rw-r--r--MdePkg/Include/Library/DebugLib.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/DebugLib.h
index 40772f2e0f..0db3b78ec8 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