From 320f92b744b44f961e5d56f5f21de003e8027a7f Mon Sep 17 00:00:00 2001 From: Andres Freund Date: Sun, 7 Aug 2022 09:36:01 -0700 Subject: Rely on __func__ being supported Previously we fell back to __FUNCTION__ and then NULL. As __func__ is in C99 that shouldn't be necessary anymore. Solution.pm defined HAVE_FUNCNAME__FUNCTION instead of HAVE_FUNCNAME__FUNC (originating in 4164e6636e2), as at some point in the past MSVC only supported __FUNCTION__. Our minimum version supports __func__. Reviewed-By: Thomas Munro Discussion: https://postgr.es/m/20220807012914.ydz73yte6j3coulo@awork3.anarazel.de --- src/backend/storage/lmgr/s_lock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/backend/storage/lmgr/s_lock.c') diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c index 2a658ff594c..4e473ec27ec 100644 --- a/src/backend/storage/lmgr/s_lock.c +++ b/src/backend/storage/lmgr/s_lock.c @@ -304,7 +304,7 @@ main() printf(" if S_LOCK() and TAS() are working.\n"); fflush(stdout); - s_lock(&test_lock.lock, __FILE__, __LINE__, PG_FUNCNAME_MACRO); + s_lock(&test_lock.lock, __FILE__, __LINE__, __func__); printf("S_LOCK_TEST: failed, lock not locked\n"); return 1; -- cgit v1.2.3