diff options
| author | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2013-02-08 12:13:34 -0300 |
|---|---|---|
| committer | Alvaro Herrera <alvherre@alvh.no-ip.org> | 2013-02-08 12:50:58 -0300 |
| commit | 381d4b70a9854a7b5b9f12d828a0824f8564f1e7 (patch) | |
| tree | e3ce0c28c9676a8f7d0a43943fbcdaca3c7166d5 | |
| parent | 5766228bc64268369b59b07cffa7d31cd4f9c9ff (diff) | |
| download | postgresql-381d4b70a9854a7b5b9f12d828a0824f8564f1e7.tar.gz postgresql-381d4b70a9854a7b5b9f12d828a0824f8564f1e7.zip | |
Clean up c.h / postgres.h after Assert() move
Per Tom
| -rw-r--r-- | src/include/c.h | 6 | ||||
| -rw-r--r-- | src/include/postgres.h | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/include/c.h b/src/include/c.h index 7c5ac8642ac..d38788ec799 100644 --- a/src/include/c.h +++ b/src/include/c.h @@ -582,7 +582,7 @@ typedef NameData *Name; #define AssertArg(condition) assert(condition) #define AssertState(condition) assert(condition) -#else /* USE_ASSERT_CHECKING && FRONTEND */ +#else /* USE_ASSERT_CHECKING && !FRONTEND */ /* * Trap @@ -619,6 +619,10 @@ typedef NameData *Name; #define AssertState(condition) \ Trap(!(condition), "BadState") +extern void ExceptionalCondition(const char *conditionName, + const char *errorType, + const char *fileName, int lineNumber) __attribute__((noreturn)); + #endif /* USE_ASSERT_CHECKING && !FRONTEND */ diff --git a/src/include/postgres.h b/src/include/postgres.h index 207f7b8ffb2..9808bdca467 100644 --- a/src/include/postgres.h +++ b/src/include/postgres.h @@ -638,10 +638,10 @@ extern Datum Float8GetDatum(float8 X); * ---------------------------------------------------------------- */ +/* + * This declaration supports the assertion-related macros in c.h. This is here + * because that file doesn't have PGDLLIMPORT in the right place. + */ extern PGDLLIMPORT bool assert_enabled; -extern void ExceptionalCondition(const char *conditionName, - const char *errorType, - const char *fileName, int lineNumber) __attribute__((noreturn)); - #endif /* POSTGRES_H */ |