diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/storage/lmgr/s_lock.c | 2 | ||||
| -rw-r--r-- | src/include/c.h | 11 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 6 | ||||
| -rw-r--r-- | src/include/storage/s_lock.h | 4 | ||||
| -rw-r--r-- | src/include/utils/elog.h | 4 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 2 |
6 files changed, 5 insertions, 24 deletions
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; diff --git a/src/include/c.h b/src/include/c.h index 8c4baeb0ec3..de9ec04d494 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -360,17 +360,6 @@ typedef void (*pg_funcptr_t) (void); */ #define FLEXIBLE_ARRAY_MEMBER /* empty */ -/* Which __func__ symbol do we have, if any? */ -#ifdef HAVE_FUNCNAME__FUNC -#define PG_FUNCNAME_MACRO __func__ -#else -#ifdef HAVE_FUNCNAME__FUNCTION -#define PG_FUNCNAME_MACRO __FUNCTION__ -#else -#define PG_FUNCNAME_MACRO NULL -#endif -#endif - /* ---------------------------------------------------------------- * Section 2: bool, true, false diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index c243a906c9b..1007b84fca1 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -158,12 +158,6 @@ /* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ #undef HAVE_FSEEKO -/* Define to 1 if your compiler understands __func__. */ -#undef HAVE_FUNCNAME__FUNC - -/* Define to 1 if your compiler understands __FUNCTION__. */ -#undef HAVE_FUNCNAME__FUNCTION - /* Define to 1 if you have __atomic_compare_exchange_n(int *, int *, int). */ #undef HAVE_GCC__ATOMIC_INT32_CAS diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h index 1c9f6f08954..0877cf65b0b 100644 --- a/src/include/storage/s_lock.h +++ b/src/include/storage/s_lock.h @@ -768,7 +768,7 @@ extern int tas_sema(volatile slock_t *lock); #if !defined(S_LOCK) #define S_LOCK(lock) \ - (TAS(lock) ? s_lock((lock), __FILE__, __LINE__, PG_FUNCNAME_MACRO) : 0) + (TAS(lock) ? s_lock((lock), __FILE__, __LINE__, __func__) : 0) #endif /* S_LOCK */ #if !defined(S_LOCK_FREE) @@ -855,7 +855,7 @@ init_spin_delay(SpinDelayStatus *status, status->func = func; } -#define init_local_spin_delay(status) init_spin_delay(status, __FILE__, __LINE__, PG_FUNCNAME_MACRO) +#define init_local_spin_delay(status) init_spin_delay(status, __FILE__, __LINE__, __func__) extern void perform_spin_delay(SpinDelayStatus *status); extern void finish_spin_delay(SpinDelayStatus *status); diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index 68ead8e8736..56398176901 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -140,7 +140,7 @@ if (__builtin_constant_p(elevel) && (elevel) >= ERROR ? \ errstart_cold(elevel, domain) : \ errstart(elevel, domain)) \ - __VA_ARGS__, errfinish(__FILE__, __LINE__, PG_FUNCNAME_MACRO); \ + __VA_ARGS__, errfinish(__FILE__, __LINE__, __func__); \ if (__builtin_constant_p(elevel) && (elevel) >= ERROR) \ pg_unreachable(); \ } while(0) @@ -150,7 +150,7 @@ const int elevel_ = (elevel); \ pg_prevent_errno_in_scope(); \ if (errstart(elevel_, domain)) \ - __VA_ARGS__, errfinish(__FILE__, __LINE__, PG_FUNCNAME_MACRO); \ + __VA_ARGS__, errfinish(__FILE__, __LINE__, __func__); \ if (elevel_ >= ERROR) \ pg_unreachable(); \ } while(0) diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index caacb965bbd..ed03524e46c 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -250,8 +250,6 @@ sub GenerateFiles HAVE_EXECINFO_H => undef, HAVE_EXPLICIT_BZERO => undef, HAVE_FSEEKO => 1, - HAVE_FUNCNAME__FUNC => undef, - HAVE_FUNCNAME__FUNCTION => 1, HAVE_GCC__ATOMIC_INT32_CAS => undef, HAVE_GCC__ATOMIC_INT64_CAS => undef, HAVE_GCC__SYNC_CHAR_TAS => undef, |