Re: [edk2-devel] [edk2-stable202402][Patch V3 1/7] MdePkg/Include: Rename _DEBUG() to address name collision

["Leif Lindholm" <quic_llindhol@quicinc.com>]

On 2024-02-09 20:32, Michael D Kinney wrote:
> When VS20xx host-based unit tests are built with debug
> libraries a name collision occurs with the DebubLib.h

Typo: DebubLib.h -> DebugLib.h
With that fixed:
Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>

> 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>
> ---
>   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



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#115382): https://edk2.groups.io/g/devel/message/115382
Mute This Topic: https://groups.io/mt/104267256/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-