diff options
Diffstat (limited to 'src/include/utils/elog.h')
| -rw-r--r-- | src/include/utils/elog.h | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h index a0244bff1fc..855c147325b 100644 --- a/src/include/utils/elog.h +++ b/src/include/utils/elog.h @@ -415,17 +415,8 @@ extern PGDLLIMPORT ErrorContextCallback *error_context_stack; error_context_stack = _save_context_stack##__VA_ARGS__; \ } while (0) -/* - * Some compilers understand pg_attribute_noreturn(); for other compilers, - * insert pg_unreachable() so that the compiler gets the point. - */ -#ifdef HAVE_PG_ATTRIBUTE_NORETURN #define PG_RE_THROW() \ pg_re_throw() -#else -#define PG_RE_THROW() \ - (pg_re_throw(), pg_unreachable()) -#endif extern PGDLLIMPORT sigjmp_buf *PG_exception_stack; @@ -476,9 +467,9 @@ extern void EmitErrorReport(void); extern ErrorData *CopyErrorData(void); extern void FreeErrorData(ErrorData *edata); extern void FlushErrorState(void); -extern void ReThrowError(ErrorData *edata) pg_attribute_noreturn(); +pg_noreturn extern void ReThrowError(ErrorData *edata); extern void ThrowErrorData(ErrorData *edata); -extern void pg_re_throw(void) pg_attribute_noreturn(); +pg_noreturn extern void pg_re_throw(void); extern char *GetErrorContextStack(void); |