mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up c.h / postgres.h after Assert() move

Browse Source 
Per Tom
This commit is contained in:
Alvaro Herrera 2013-02-08 12:13:34 -03:00
parent 5766228bc6
commit 381d4b70a9
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/c.h
View File

@ -582,7 +582,7 @@ typedef NameData *Name;
#define AssertArg(condition) assert(condition) #define AssertArg(condition) assert(condition)
#define AssertState(condition) assert(condition) #define AssertState(condition) assert(condition)
#else /* USE_ASSERT_CHECKING && FRONTEND */ #else /* USE_ASSERT_CHECKING && !FRONTEND */
/* /*
* Trap * Trap
@ -619,6 +619,10 @@ 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 */

8
src/include/postgres.h
View File

@ -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 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 */