NotificationsYou must be signed in to change notification settings
Fork5
Star27

Commit8d11c30

committed

Include <sys/select.h> where needed

<sys/select.h> is required by POSIX.1-2001 to get the prototype ofselect(2), but nearly no systems enforce that because older standardslet you get away with including some other headers. Recent OpenBSDhacking has removed that frail touch of friendliness, however, whichbroke some compiles; fix all the way back to 9.1 by adding the requiredstandard. Only vacuumdb.c was reported to fail, but it seems easier tofix the whole lot in a fell swoop.Per bug #14334 by Sean Farrell.

1 parent1e903c2 commit8d11c30Copy full SHA for 8d11c30

File tree

9 files changed

+30

-1

lines changed

src
- backend
  - libpq
    - auth.c
  - postmaster
    - pgstat.c
- bin
  - pg_basebackup
  - pg_dump
    - parallel.c
  - scripts
    - vacuumdb.c
- port
  - pgsleep.c
- test/examples
  - testlibpq2.c

9 files changed

+30

-1

lines changed

`‎src/backend/libpq/auth.c‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,9 @@`
`20`	`20`	`#include<netinet/in.h>`
`21`	`21`	`#include<arpa/inet.h>`
`22`	`22`	`#include<unistd.h>`
	`23`	`+#ifdefHAVE_SYS_SELECT_H`
	`24`	`+#include<sys/select.h>`
	`25`	`+#endif`
`23`	`26`
`24`	`27`	`#include"libpq/auth.h"`
`25`	`28`	`#include"libpq/crypt.h"`

`‎src/backend/postmaster/pgstat.c‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@`
`28`	`28`	`#include<arpa/inet.h>`
`29`	`29`	`#include<signal.h>`
`30`	`30`	`#include<time.h>`
	`31`	`+#ifdefHAVE_SYS_SELECT_H`
	`32`	`+#include<sys/select.h>`
	`33`	`+#endif`
`31`	`34`
`32`	`35`	`#include"pgstat.h"`
`33`	`36`

`‎src/bin/pg_basebackup/pg_basebackup.c‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@`
`20`	`20`	`#include<sys/wait.h>`
`21`	`21`	`#include<signal.h>`
`22`	`22`	`#include<time.h>`
`23`		`-`
	`23`	`+#ifdefHAVE_SYS_SELECT_H`
	`24`	`+#include<sys/select.h>`
	`25`	`+#endif`
`24`	`26`	`#ifdefHAVE_LIBZ`
`25`	`27`	`#include<zlib.h>`
`26`	`28`	`#endif`

`‎src/bin/pg_basebackup/pg_recvlogical.c‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,9 @@`
`15`	`15`	`#include<dirent.h>`
`16`	`16`	`#include<sys/stat.h>`
`17`	`17`	`#include<unistd.h>`
	`18`	`+#ifdefHAVE_SYS_SELECT_H`
	`19`	`+#include<sys/select.h>`
	`20`	`+#endif`
`18`	`21`
`19`	`22`	`/* local includes */`
`20`	`23`	`#include"streamutil.h"`

`‎src/bin/pg_basebackup/receivelog.c‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,9 @@`
`16`	`16`
`17`	`17`	`#include<sys/stat.h>`
`18`	`18`	`#include<unistd.h>`
	`19`	`+#ifdefHAVE_SYS_SELECT_H`
	`20`	`+#include<sys/select.h>`
	`21`	`+#endif`
`19`	`22`
`20`	`23`	`/* local includes */`
`21`	`24`	`#include"receivelog.h"`

`‎src/bin/pg_dump/parallel.c‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,10 @@`
`59`	`59`
`60`	`60`	`#include"postgres_fe.h"`
`61`	`61`
	`62`	`+#ifdefHAVE_SYS_SELECT_H`
	`63`	`+#include<sys/select.h>`
	`64`	`+#endif`
	`65`	`+`
`62`	`66`	`#include"parallel.h"`
`63`	`67`	`#include"pg_backup_utils.h"`
`64`	`68`

`‎src/bin/scripts/vacuumdb.c‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,10 @@`
`12`	`12`
`13`	`13`	`#include"postgres_fe.h"`
`14`	`14`
	`15`	`+#ifdefHAVE_SYS_SELECT_H`
	`16`	`+#include<sys/select.h>`
	`17`	`+#endif`
	`18`	`+`
`15`	`19`	`#include"common.h"`
`16`	`20`	`#include"dumputils.h"`
`17`	`21`

`‎src/port/pgsleep.c‎`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,9 @@`
`14`	`14`
`15`	`15`	`#include<unistd.h>`
`16`	`16`	`#include<sys/time.h>`
	`17`	`+#ifdefHAVE_SYS_SELECT_H`
	`18`	`+#include<sys/select.h>`
	`19`	`+#endif`
`17`	`20`
`18`	`21`	`/*`
`19`	`22`	`* In a Windows backend, we don't use this implementation, but rather`

`‎src/test/examples/testlibpq2.c‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,10 @@`
`34`	`34`	`#include<errno.h>`
`35`	`35`	`#include<sys/time.h>`
`36`	`36`	`#include<sys/types.h>`
	`37`	`+#ifdefHAVE_SYS_SELECT_H`
	`38`	`+#include<sys/select.h>`
	`39`	`+#endif`
	`40`	`+`
`37`	`41`	`#include"libpq-fe.h"`
`38`	`42`
`39`	`43`	`staticvoid`

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!

Commit8d11c30

File tree

9 files changed

9 files changed

`‎src/backend/libpq/auth.c‎`

`‎src/backend/postmaster/pgstat.c‎`

`‎src/bin/pg_basebackup/pg_basebackup.c‎`

`‎src/bin/pg_basebackup/pg_recvlogical.c‎`

`‎src/bin/pg_basebackup/receivelog.c‎`

`‎src/bin/pg_dump/parallel.c‎`

`‎src/bin/scripts/vacuumdb.c‎`

`‎src/port/pgsleep.c‎`

`‎src/test/examples/testlibpq2.c‎`

0 commit comments