Commit381d4b7

committed

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

Per Tom

1 parent5766228 commit381d4b7Copy full SHA for 381d4b7

File tree

-5

lines changed

-5

lines changed

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -582,7 +582,7 @@ typedef NameData *Name;`
`582`	`582`	`#defineAssertArg(condition) assert(condition)`
`583`	`583`	`#defineAssertState(condition) assert(condition)`
`584`	`584`
`585`		`-#else/* USE_ASSERT_CHECKING && FRONTEND */`
	`585`	`+#else/* USE_ASSERT_CHECKING &&!FRONTEND */`
`586`	`586`
`587`	`587`	`/*`
`588`	`588`	`* Trap`
`@@ -619,6 +619,10 @@ typedef NameData *Name;`
`619`	`619`	`#defineAssertState(condition) \`
`620`	`620`	`Trap(!(condition), "BadState")`
`621`	`621`
	`622`	`+externvoidExceptionalCondition(constchar*conditionName,`
	`623`	`+constchar*errorType,`
	`624`	`+constchar*fileName,intlineNumber) __attribute__((noreturn));`
	`625`	`+`
`622`	`626`	`#endif/* USE_ASSERT_CHECKING && !FRONTEND */`
`623`	`627`
`624`	`628`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -638,10 +638,10 @@ extern Datum Float8GetDatum(float8 X);`
`638`	`638`	`* ----------------------------------------------------------------`
`639`	`639`	`*/`
`640`	`640`
	`641`	`+/*`
	`642`	`+ * This declaration supports the assertion-related macros in c.h. This is here`
	`643`	`+ * because that file doesn't have PGDLLIMPORT in the right place.`
	`644`	`+ */`
`641`	`645`	`externPGDLLIMPORTboolassert_enabled;`
`642`	`646`
`643`		`-externvoidExceptionalCondition(constchar*conditionName,`
`644`		`-constchar*errorType,`
`645`		`-constchar*fileName,intlineNumber) __attribute__((noreturn));`
`646`		`-`
`647`	`647`	`#endif/* POSTGRES_H */`

Comments

(0)