NotificationsYou must be signed in to change notification settings
Fork4.9k
Star17.7k

Commita40d09e

committed

Move ExceptionalCondition back to postgres.h

It needs to be defined in the backend even when assertions are notenabled. It's cleaner to put it back, than create a separate #ifdefsection in c.h.Per trouble report from Jeff Janes

1 parent187492b commita40d09eCopy full SHA for a40d09e

File tree

2 files changed

-6

lines changed

src/include
- c.h
- postgres.h

2 files changed

-6

lines changed

`‎src/include/c.h`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -619,10 +619,6 @@ 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`		`-`
`626`	`622`	`#endif/* USE_ASSERT_CHECKING && !FRONTEND */`
`627`	`623`
`628`	`624`

`‎src/include/postgres.h`

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -639,9 +639,15 @@ extern Datum Float8GetDatum(float8 X);`
`639`	`639`	`*/`
`640`	`640`
`641`	`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.`
	`642`	`+ * These declarations supports the assertion-related macros in c.h.`
	`643`	`+ * assert_enabled is here because that file doesn't have PGDLLIMPORT in the`
	`644`	`+ * right place, and ExceptionalCondition must be present, for the backend only,`
	`645`	`+ * even when assertions are not enabled.`
`644`	`646`	`*/`
`645`	`647`	`externPGDLLIMPORTboolassert_enabled;`
`646`	`648`
	`649`	`+externvoidExceptionalCondition(constchar*conditionName,`
	`650`	`+constchar*errorType,`
	`651`	`+constchar*fileName,intlineNumber) __attribute__((noreturn));`
	`652`	`+`
`647`	`653`	`#endif/* POSTGRES_H */`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commita40d09e

File tree

2 files changed

2 files changed

`‎src/include/c.h`

`‎src/include/postgres.h`

0 commit comments