Reviewed-by: Gua Guo <gua....@intel.com> -----Original Message----- From: Rebecca Cran <rebe...@bsdio.com> Sent: Friday, April 7, 2023 6:23 AM To: devel@edk2.groups.io; Gao, Liming <gaolim...@byosoft.com.cn>; Kinney, Michael D <michael.d.kin...@intel.com>; Jiang, Guomin <guomin.ji...@intel.com>; Xu, Wei6 <wei6...@intel.com>; Dong, Guo <guo.d...@intel.com>; Ni, Ray <ray...@intel.com>; Rhodes, Sean <sean@starlabs.systems>; Lu, James <james...@intel.com>; Guo, Gua <gua....@intel.com>; Andrew Fish <af...@apple.com>; Wu, Hao A <hao.a...@intel.com>; Maciej Rabeda <maciej.rab...@linux.intel.com>; Siyuan Fu <siyuan...@intel.com>; Yao, Jiewen <jiewen....@intel.com>; Wang, Jian J <jian.j.w...@intel.com>; Lu, Xiaoyu1 <xiaoyu1...@intel.com>; Ard Biesheuvel <ardb+tianoc...@kernel.org>; Sami Mujawar <sami.muja...@arm.com>; Supreeth Venkatesh <supreeth.venkat...@arm.com>; Michael Kubacki <mikub...@linux.microsoft.com>; Desimone, Nathaniel L <nathaniel.l.desim...@intel.com>; Sean Brogan <sean.bro...@microsoft.com> Cc: Rebecca Cran <rebe...@bsdio.com>; Leif Lindholm <quic_llind...@quicinc.com>; Abner Chang <abner.ch...@amd.com>; Nickle Wang <nick...@nvidia.com>; Igor Kulchytskyy <ig...@ami.com>; Daniel Schaefer <g...@danielschaefer.me>; Xu, Min M <min.m...@intel.com>; Justen, Jordan L <jordan.l.jus...@intel.com>; Gerd Hoffmann <kra...@redhat.com>; Peter Grehan <gre...@freebsd.org>; Aktas, Erdem <erdemak...@google.com>; James Bottomley <j...@linux.ibm.com>; Tom Lendacky <thomas.lenda...@amd.com>; Michael Roth <michael.r...@amd.com>; Sunil V L <suni...@ventanamicro.com>; Warkentin, Andrei <andrei.warken...@intel.com> 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 <rebe...@bsdio.com> --- 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 (#102664): https://edk2.groups.io/g/devel/message/102664 Mute This Topic: https://groups.io/mt/98115256/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-