NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit0c08856

committed

Don't use #if inside function-like macro arguments.

No concrete problem reported, but in the past it's been known to causeproblems on some compilers so let's avoid doing that.Reported-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://postgr.es/m/234364.1626704007%40sss.pgh.pa.us

1 parent0d2cb6b commit0c08856Copy full SHA for 0c08856

File tree

1 file changed

-6

lines changed

src/backend/storage/file
- fd.c

1 file changed

-6

lines changed

`‎src/backend/storage/file/fd.c`

Lines changed: 9 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1065,20 +1065,23 @@ BasicOpenFilePerm(const char *fileName, int fileFlags, mode_t fileMode)`
`1065`	`1065`	`*/`
`1066`	`1066`	`StaticAssertStmt((PG_O_DIRECT&`
`1067`	`1067`	`(O_APPEND \|`
`1068`		`-#if defined(O_CLOEXEC)`
`1069`		`-O_CLOEXEC \|`
`1070`		`-#endif`
`1071`	`1068`	`O_CREAT \|`
`1072`		`-#if defined(O_DSYNC)`
`1073`		`-O_DSYNC \|`
`1074`		`-#endif`
`1075`	`1069`	`O_EXCL \|`
`1076`	`1070`	`O_RDWR \|`
`1077`	`1071`	`O_RDONLY \|`
`1078`	`1072`	`O_SYNC \|`
`1079`	`1073`	`O_TRUNC \|`
`1080`	`1074`	`O_WRONLY))==0,`
`1081`	`1075`	`"PG_O_DIRECT value collides with standard flag");`
	`1076`	`+#if defined(O_CLOEXEC)`
	`1077`	`+StaticAssertStmt((PG_O_DIRECT&O_CLOEXEC)==0,`
	`1078`	`+"PG_O_DIRECT value collides with O_CLOEXEC");`
	`1079`	`+#endif`
	`1080`	`+#if defined(O_DSYNC)`
	`1081`	`+StaticAssertStmt((PG_O_DIRECT&O_DSYNC)==0,`
	`1082`	`+"PG_O_DIRECT value collides with O_DSYNC");`
	`1083`	`+#endif`
	`1084`	`+`
`1082`	`1085`	`fd=open(fileName,fileFlags& ~PG_O_DIRECT,fileMode);`
`1083`	`1086`	`#else`
`1084`	`1087`	`fd=open(fileName,fileFlags,fileMode);`

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!

Commit0c08856

File tree

1 file changed

1 file changed

`‎src/backend/storage/file/fd.c`

0 commit comments