Partially revert commit 536d47b.

tglsfdc · tglsfdc · commit 5041cdf2b792 · 2017-04-22T02:06:16.000-04:00
Per buildfarm, the "#ifdef F_SETFD" removed in that commit actually is needed on Windows, because fcntl() isn't available at all on that platform, unless using Cygwin. We could perhaps spell it more like "#ifdef HAVE_FCNTL", or "#ifndef WIN32", but it's not clear that those choices are better. It does seem that we don't need the bogus manual definition of FD_CLOEXEC, though, so keep that change. Discussion: https://postgr.es/m/26254.1492805635@sss.pgh.pa.us
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
@@ -1983,6 +1983,7 @@ PQconnectPoll(PGconn *conn)
 						continue;
 					}
 
+#ifdef F_SETFD
 					if (fcntl(conn->sock, F_SETFD, FD_CLOEXEC) == -1)
 					{
 						appendPQExpBuffer(&conn->errorMessage,
@@ -1992,6 +1993,7 @@ 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
`@@ -1983,6 +1983,7 @@ PQconnectPoll(PGconn *conn)`
`1983`	`1983`	`continue;`
`1984`	`1984`	`}`
`1985`	`1985`
	`1986`	`+#ifdef F_SETFD`
`1986`	`1987`	`if (fcntl(conn->sock, F_SETFD, FD_CLOEXEC) == -1)`
`1987`	`1988`	`{`
`1988`	`1989`	`appendPQExpBuffer(&conn->errorMessage,`
`@@ -1992,6 +1993,7 @@ PQconnectPoll(PGconn *conn)`
`1992`	`1993`	`conn->addr_cur = addr_cur->ai_next;`
`1993`	`1994`	`continue;`
`1994`	`1995`	`}`
	`1996`	`+#endif /* F_SETFD */`
`1995`	`1997`
`1996`	`1998`	`if (!IS_AF_UNIX(addr_cur->ai_family))`
`1997`	`1999`	`{`