]> granicus.if.org Git - postgresql/commitdiff
Remove long-obsolete catering for platforms without F_SETFD/FD_CLOEXEC.
authorTom Lane <tgl@sss.pgh.pa.us>
Fri, 21 Apr 2017 18:48:29 +0000 (14:48 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Fri, 21 Apr 2017 18:48:29 +0000 (14:48 -0400)
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 7627b91cd to see if the
buildfarm agrees.

Discussion: https://postgr.es/m/21444.1492798101@sss.pgh.pa.us

src/interfaces/libpq/fe-connect.c

index bf4c27c6e232b8c4274f5829e327c0991e582e4e..1b7175d9ef914db47590a83cbf559134dcb09a96 100644 (file)
@@ -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 @@ keep_going:                                               /* We will come back to here until there is
                                                continue;
                                        }
 
-#ifdef F_SETFD
                                        if (fcntl(conn->sock, F_SETFD, FD_CLOEXEC) == -1)
                                        {
                                                appendPQExpBuffer(&conn->errorMessage,
@@ -1997,7 +1992,6 @@ keep_going:                                               /* We will come back to here until there is
                                                conn->addr_cur = addr_cur->ai_next;
                                                continue;
                                        }
-#endif   /* F_SETFD */
 
                                        if (!IS_AF_UNIX(addr_cur->ai_family))
                                        {