diff options
Diffstat (limited to 'src/interfaces/libpq/fe-connect.c')
| -rw-r--r-- | src/interfaces/libpq/fe-connect.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index dc49387d6c5..730e79a31d2 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -1102,10 +1102,8 @@ connectOptions2(PGconn *conn) else if (ch->host != NULL && ch->host[0] != '\0') { ch->type = CHT_HOST_NAME; -#ifdef HAVE_UNIX_SOCKETS if (is_unixsock_path(ch->host)) ch->type = CHT_UNIX_SOCKET; -#endif } else { @@ -1115,14 +1113,12 @@ connectOptions2(PGconn *conn) * This bit selects the default host location. If you change * this, see also pg_regress. */ -#ifdef HAVE_UNIX_SOCKETS if (DEFAULT_PGSOCKET_DIR[0]) { ch->host = strdup(DEFAULT_PGSOCKET_DIR); ch->type = CHT_UNIX_SOCKET; } else -#endif { ch->host = strdup(DefaultHost); ch->type = CHT_HOST_NAME; @@ -1684,7 +1680,6 @@ getHostaddr(PGconn *conn, char *host_addr, int host_addr_len) static void emitHostIdentityInfo(PGconn *conn, const char *host_addr) { -#ifdef HAVE_UNIX_SOCKETS if (conn->raddr.addr.ss_family == AF_UNIX) { char service[NI_MAXHOST]; @@ -1698,7 +1693,6 @@ emitHostIdentityInfo(PGconn *conn, const char *host_addr) service); } else -#endif /* HAVE_UNIX_SOCKETS */ { const char *displayed_host; const char *displayed_port; @@ -1748,12 +1742,10 @@ connectFailureMessage(PGconn *conn, int errorno) "%s\n", SOCK_STRERROR(errorno, sebuf, sizeof(sebuf))); -#ifdef HAVE_UNIX_SOCKETS if (conn->raddr.addr.ss_family == AF_UNIX) appendPQExpBufferStr(&conn->errorMessage, libpq_gettext("\tIs the server running locally and accepting connections on that socket?\n")); else -#endif appendPQExpBufferStr(&conn->errorMessage, libpq_gettext("\tIs the server running on that host and accepting TCP/IP connections?\n")); } @@ -2415,7 +2407,6 @@ keep_going: /* We will come back to here until there is break; case CHT_UNIX_SOCKET: -#ifdef HAVE_UNIX_SOCKETS conn->addrlist_family = hint.ai_family = AF_UNIX; UNIXSOCK_PATH(portstr, thisport, ch->host); if (strlen(portstr) >= UNIXSOCK_PATH_BUFLEN) @@ -2440,9 +2431,6 @@ keep_going: /* We will come back to here until there is portstr, gai_strerror(ret)); goto keep_going; } -#else - Assert(false); -#endif break; } |