mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-21 08:29:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move ExceptionalCondition back to postgres.h

Browse Source 
It needs to be defined in the backend even when assertions are not
enabled.  It's cleaner to put it back, than create a separate #ifdef
section in c.h.

Per trouble report from Jeff Janes
This commit is contained in:
Alvaro Herrera 2013-02-18 18:53:32 -03:00
parent 187492b6c2
commit a40d09e27f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/c.h
View File

@ -619,10 +619,6 @@ typedef NameData *Name;
#define AssertState(condition) \ #define AssertState(condition) \
Trap(!(condition), "BadState") Trap(!(condition), "BadState")
extern void ExceptionalCondition(const char *conditionName,
const char *errorType,
const char *fileName, int lineNumber) __attribute__((noreturn));
#endif /* USE_ASSERT_CHECKING && !FRONTEND */ #endif /* USE_ASSERT_CHECKING && !FRONTEND */

10
src/include/postgres.h
View File

@ -639,9 +639,15 @@ extern Datum Float8GetDatum(float8 X);
*/ */
/* /*
* This declaration supports the assertion-related macros in c.h. This is here * These declarations supports the assertion-related macros in c.h.
* because that file doesn't have PGDLLIMPORT in the right place. * assert_enabled is here because that file doesn't have PGDLLIMPORT in the
* right place, and ExceptionalCondition must be present, for the backend only,
* even when assertions are not enabled.
*/ */
extern PGDLLIMPORT bool assert_enabled; extern PGDLLIMPORT bool assert_enabled;
extern void ExceptionalCondition(const char *conditionName,
const char *errorType,
const char *fileName, int lineNumber) __attribute__((noreturn));
#endif /* POSTGRES_H */ #endif /* POSTGRES_H */