Remove long-obsolete catering for platforms without F_SETFD/FD_CLOEXEC.

tglsfdc · tglsfdc · commit 536d47bd9d5f · 2017-04-21T14:48:29.000-04:00
SUSv2 mandates that <fcntl.h> provide both F_SETFD and FD_CLOEXEC, so it seems pretty unlikely that any platforms remain without those. Remove the #ifdef-ery installed by commit 7627b91 to see if the buildfarm agrees. Discussion: https://postgr.es/m/21444.1492798101@sss.pgh.pa.us
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -74,10 +74,6 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
 #include "common/ip.h"
 #include "mb/pg_wchar.h"
 
-#ifndef FD_CLOEXEC
-#define FD_CLOEXEC 1
-#endif
-
 
 #ifndef WIN32
 #define PGPASSFILE ".pgpass"
@@ -1987,7 +1983,6 @@ PQconnectPoll(PGconn *conn)
 						continue;
 					}
 
-#ifdef F_SETFD
 					if (fcntl(conn->sock, F_SETFD, FD_CLOEXEC) == -1)
 					{
 						appendPQExpBuffer(&conn->errorMessage,
@@ -1997,7 +1992,6 @@ PQconnectPoll(PGconn *conn)
 						conn->addr_cur = addr_cur->ai_next;
 						continue;
 					}
-#endif   /* F_SETFD */
 
 					if (!IS_AF_UNIX(addr_cur->ai_family))
 					{

Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,6 @@ static int ldapServiceLookup(const char purl, PQconninfoOption options,`
`74`	`74`	`#include "common/ip.h"`
`75`	`75`	`#include "mb/pg_wchar.h"`
`76`	`76`
`77`		`-#ifndef FD_CLOEXEC`
`78`		`-#define FD_CLOEXEC 1`
`79`		`-#endif`
`80`		`-`
`81`	`77`
`82`	`78`	`#ifndef WIN32`
`83`	`79`	`#define PGPASSFILE ".pgpass"`
`@@ -1987,7 +1983,6 @@ PQconnectPoll(PGconn *conn)`
`1987`	`1983`	`continue;`
`1988`	`1984`	`}`
`1989`	`1985`
`1990`		`-#ifdef F_SETFD`
`1991`	`1986`	`if (fcntl(conn->sock, F_SETFD, FD_CLOEXEC) == -1)`
`1992`	`1987`	`{`
`1993`	`1988`	`appendPQExpBuffer(&conn->errorMessage,`
`@@ -1997,7 +1992,6 @@ PQconnectPoll(PGconn *conn)`
`1997`	`1992`	`conn->addr_cur = addr_cur->ai_next;`
`1998`	`1993`	`continue;`
`1999`	`1994`	`}`
`2000`		`-#endif /* F_SETFD */`
`2001`	`1995`
`2002`	`1996`	`if (!IS_AF_UNIX(addr_cur->ai_family))`
`2003`	`1997`	`{`