Include where needed

 is required by POSIX.1-2001 to get the prototype of
select(2), but nearly no systems enforce that because older standards
let you get away with including some other headers.  Recent OpenBSD
hacking has removed that frail touch of friendliness, however, which
broke some compiles; fix all the way back to 9.1 by adding the required
standard.  Only vacuumdb.c was reported to fail, but it seems easier to
fix the whole lot in a fell swoop.

Per bug #14334 by Sean Farrell.

diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index dd8d2e9ff3995c253686d7a559ca63b27b3d5204..936a7ccae570aabeb087d645beaa71eaac9f8786 100644 (file)
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -20,6 +20,9 @@
 #include 
 #include 
 #include 
+#ifdef HAVE_SYS_SELECT_H
+#include 
+#endif
 
 #include "libpq/auth.h"
 #include "libpq/crypt.h"

diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 3c862feb92767e1b66613adcbef90513aabd77e9..0440f4a1d453ef77bb0830837e698bfbd1b13f5a 100644 (file)
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -28,6 +28,9 @@
 #include 
 #include 
 #include 
+#ifdef HAVE_SYS_SELECT_H
+#include 
+#endif
 
 #include "pgstat.h"
 

diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index 84eef6466d7682224273ab178c62dc41ce16b7e4..fd93a3bc09ee6d9cf84b7ff5da4ca485fc92adc7 100644 (file)
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -20,7 +20,9 @@
 #include 
 #include 
 #include 
-
+#ifdef HAVE_SYS_SELECT_H
+#include 
+#endif
 #ifdef HAVE_LIBZ
 #include 
 #endif

diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index 73625256acab26cd630d5b65db962b33b84d7b3c..5907d607b094d3868c891dd53d2c89f5d3af1189 100644 (file)
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -15,6 +15,9 @@
 #include 
 #include 
 #include 
+#ifdef HAVE_SYS_SELECT_H
+#include 
+#endif
 
 /* local includes */
 #include "streamutil.h"

diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
index f8bd551ef959042fa80a5394d8d201111e7f4fd0..406c01bfccc83fe7660bac001b095dd6e158f274 100644 (file)
--- a/src/bin/pg_basebackup/receivelog.c
+++ b/src/bin/pg_basebackup/receivelog.c
@@ -16,6 +16,9 @@
 
 #include 
 #include 
+#ifdef HAVE_SYS_SELECT_H
+#include 
+#endif
 
 /* local includes */
 #include "receivelog.h"

diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
index 51a8eee369db710f2d8c56896ac1aa3073ab81e3..ce3a06ae816ba2cd8df29f317e2f2935e9352a18 100644 (file)
--- a/src/bin/pg_dump/parallel.c
+++ b/src/bin/pg_dump/parallel.c
@@ -59,6 +59,10 @@
 
 #include "postgres_fe.h"
 
+#ifdef HAVE_SYS_SELECT_H
+#include 
+#endif
+
 #include "parallel.h"
 #include "pg_backup_utils.h"
 

diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index f99be3bf7a159a09cfa960427326bca45f7e1886..2125f42c99d47c1fceaf7cb9edab00e88528427c 100644 (file)
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -12,6 +12,10 @@
 
 #include "postgres_fe.h"
 
+#ifdef HAVE_SYS_SELECT_H
+#include 
+#endif
+
 #include "common.h"
 #include "dumputils.h"
 

diff --git a/src/port/pgsleep.c b/src/port/pgsleep.c
index 89a12b9da7c451e25053f6fc818844eede8b5a34..3f84d8f24097e5bf55309ddf8a2e99cc12162656 100644 (file)
--- a/src/port/pgsleep.c
+++ b/src/port/pgsleep.c
@@ -14,6 +14,9 @@
 
 #include 
 #include 
+#ifdef HAVE_SYS_SELECT_H
+#include 
+#endif
 
 /*
  * In a Windows backend, we don't use this implementation, but rather

diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c
index 850993f6e82af05ac72dfbc4936307f8b3b63bd1..07c6317a2123dd3b7808bef9895bd35bb9a9cf0e 100644 (file)
--- a/src/test/examples/testlibpq2.c
+++ b/src/test/examples/testlibpq2.c
@@ -34,6 +34,10 @@
 #include 
 #include 
 #include 
+#ifdef HAVE_SYS_SELECT_H
+#include 
+#endif
+
 #include "libpq-fe.h"
 
 static void