diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2012-04-29 21:07:35 +0300 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2012-04-29 21:20:14 +0300 |
| commit | 81107282a5ff1490a0a4ded193cbc61e69cda537 (patch) | |
| tree | bc39c1a3ff53655183d246fb7a6bd4da011262f0 /src/backend/utils/error/elog.c | |
| parent | 2227bb9c948d2dcc167d414630ed3bae7f31db83 (diff) | |
Change return type of ExceptionalCondition to void and mark it noreturn
In ancient times, it was thought that this wouldn't work because of
TrapMacro/AssertMacro, but changing those to use a comma operator
appears to work without compiler warnings.
Diffstat (limited to 'src/backend/utils/error/elog.c')
| -rw-r--r-- | src/backend/utils/error/elog.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c index 239ac19882d..65c28a75080 100644 --- a/src/backend/utils/error/elog.c +++ b/src/backend/utils/error/elog.c @@ -1507,15 +1507,9 @@ pg_re_throw(void) errfinish(0); } - /* We mustn't return... */ + /* Doesn't return ... */ ExceptionalCondition("pg_re_throw tried to return", "FailedAssertion", __FILE__, __LINE__); - - /* - * Since ExceptionalCondition isn't declared noreturn because of - * TrapMacro(), we need this to keep gcc from complaining. - */ - abort(); } |