[edk2-devel] [PATCH 09/18] ArmPlatformPkg: Update code to be more C11 compliant by using __func__

Rebecca Cran rebecca at bsdio.com
Thu Apr 6 22:23:10 UTC 2023


__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
ArmPlatformPkg.

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 <rebecca at bsdio.com>
---
 ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c b/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c
index 5821dc195822..b8e7fbe38d77 100644
--- a/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c
+++ b/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c
@@ -397,7 +397,7 @@ SP805Initialize (
       DEBUG ((
         DEBUG_ERROR,
         "%a: failed to register watchdog interrupt - %r\n",
-        __FUNCTION__,
+        __func__,
         Status
         ));
       return Status;
@@ -406,7 +406,7 @@ SP805Initialize (
     DEBUG ((
       DEBUG_WARN,
       "%a: no interrupt specified, running in RESET mode only\n",
-      __FUNCTION__
+      __func__
       ));
   }
 
-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#102639): https://edk2.groups.io/g/devel/message/102639
Mute This Topic: https://groups.io/mt/98115245/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-




More information about the edk2-devel-archive mailing list