Reviewed-by: James Lu <[email protected]>
Thanks, James -----Original Message----- From: Rebecca Cran <[email protected]> Sent: Friday, April 7, 2023 6:23 AM To: [email protected]; Gao, Liming <[email protected]>; Kinney, Michael D <[email protected]>; Jiang, Guomin <[email protected]>; Xu, Wei6 <[email protected]>; Dong, Guo <[email protected]>; Ni, Ray <[email protected]>; Rhodes, Sean <[email protected]>; Lu, James <[email protected]>; Guo, Gua <[email protected]>; Andrew Fish <[email protected]>; Wu, Hao A <[email protected]>; Maciej Rabeda <[email protected]>; Siyuan Fu <[email protected]>; Yao, Jiewen <[email protected]>; Wang, Jian J <[email protected]>; Lu, Xiaoyu1 <[email protected]>; Ard Biesheuvel <[email protected]>; Sami Mujawar <[email protected]>; Supreeth Venkatesh <[email protected]>; Michael Kubacki <[email protected]>; Desimone, Nathaniel L <[email protected]>; Sean Brogan <[email protected]> Cc: Rebecca Cran <[email protected]>; Leif Lindholm <[email protected]>; Abner Chang <[email protected]>; Nickle Wang <[email protected]>; Igor Kulchytskyy <[email protected]>; Daniel Schaefer <[email protected]>; Xu, Min M <[email protected]>; Justen, Jordan L <[email protected]>; Gerd Hoffmann <[email protected]>; Peter Grehan <[email protected]>; Aktas, Erdem <[email protected]>; James Bottomley <[email protected]>; Tom Lendacky <[email protected]>; Michael Roth <[email protected]>; Sunil V L <[email protected]>; Warkentin, Andrei <[email protected]> Subject: [PATCH 17/18] UefiPayloadPkg: Update code to be more C11 compliant by using __func__ __FUNCTION__ is a pre-standard extension that gcc and Visual C++ among others support, while __func__ was standardized in C99. Since it's more standard, replace __FUNCTION__ with __func__ throughout UefiPayloadPkg. Visual Studio versions before VS 2015 don't support __func__ and so will fail to compile. A workaround is to define __func__ as __FUNCTION__ : #define __func__ __FUNCTION__ Signed-off-by: Rebecca Cran <[email protected]> --- UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c | 4 ++-- UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c index 790e6109c03e..57274754141d 100644 --- a/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c +++ b/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c @@ -135,7 +135,7 @@ InitRootBridge ( &mRootBridgeDevicePathTemplate ); if (DevicePath == NULL) { - DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES)); + DEBUG ((DEBUG_ERROR, "%a: %r\n", __func__, EFI_OUT_OF_RESOURCES)); return EFI_OUT_OF_RESOURCES; } @@ -145,7 +145,7 @@ InitRootBridge ( DEBUG (( DEBUG_INFO, "%a: populated root bus %d, with room for %d subordinate bus(es)\n", - __FUNCTION__, + __func__, RootBusNumber, MaxSubBusNumber - RootBusNumber )); diff --git a/UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c b/UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c index c66e56aee15a..61a9f01ec9e7 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c +++ b/UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c @@ -355,7 +355,7 @@ HandOffToDxeCore ( DEBUG (( DEBUG_INFO, "%a() Stack Base: 0x%lx, Stack Size: 0x%x\n", - __FUNCTION__, + __func__, BaseOfStack, STACK_SIZE )); -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#102674): https://edk2.groups.io/g/devel/message/102674 Mute This Topic: https://groups.io/mt/98115256/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
