diff options
author | Tom Lane | 2020-02-24 23:43:23 +0000 |
---|---|---|
committer | Tom Lane | 2020-02-24 23:43:40 +0000 |
commit | 36390713a60f446da7e7ae758771c9104fa89394 (patch) | |
tree | e68dfd42f30f9000fb39f698a64c8cf608bb5018 /contrib/postgres_fdw | |
parent | 2742c45080077ed3b08b810bb96341499b86d530 (diff) |
Fix compile failure.
I forgot that some compilers won't handle #if constructs within
ereport() calls. Duplicating most of the call is annoying but simple.
Per buildfarm.
Diffstat (limited to 'contrib/postgres_fdw')
-rw-r--r-- | contrib/postgres_fdw/connection.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index a151c2c653f..e45647f3eaf 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -269,17 +269,23 @@ connect_pg_server(ForeignServer *server, UserMapping *user) * ensures that VFDs are closed if needed to make room.) */ if (!AcquireExternalFD()) + { +#ifndef WIN32 /* can't write #if within ereport() macro */ ereport(ERROR, (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), errmsg("could not connect to server \"%s\"", server->servername), errdetail("There are too many open files on the local server."), -#ifndef WIN32 - errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits.") + errhint("Raise the server's max_files_per_process and/or \"ulimit -n\" limits."))); #else - errhint("Raise the server's max_files_per_process setting.") + ereport(ERROR, + (errcode(ERRCODE_SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION), + errmsg("could not connect to server \"%s\"", + server->servername), + errdetail("There are too many open files on the local server."), + errhint("Raise the server's max_files_per_process setting."))); #endif - )); + } /* OK to make connection */ conn = PQconnectdbParams(keywords, values, false); |