mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partially revert commit 536d47bd9d5fce8d91929bee3128fa1d08dbcc57.

Browse Source 
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
This commit is contained in:
Tom Lane 2017-04-22 02:06:16 -04:00
parent f58b664393
commit 5041cdf2b7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/interfaces/libpq/fe-connect.c
View File

@ -1983,6 +1983,7 @@ keep_going: /* We will come back to here until there is
continue; continue;
} }
#ifdef F_SETFD
if (fcntl(conn->sock, F_SETFD, FD_CLOEXEC) == -1) if (fcntl(conn->sock, F_SETFD, FD_CLOEXEC) == -1)
{ {
appendPQExpBuffer(&conn->errorMessage, appendPQExpBuffer(&conn->errorMessage,
@ -1992,6 +1993,7 @@ keep_going: /* We will come back to here until there is
conn->addr_cur = addr_cur->ai_next; conn->addr_cur = addr_cur->ai_next;
continue; continue;
} }
#endif /* F_SETFD */
if (!IS_AF_UNIX(addr_cur->ai_family)) if (!IS_AF_UNIX(addr_cur->ai_family))
{ {