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/dblink | |
| 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/dblink')
| -rw-r--r-- | contrib/dblink/dblink.c | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index 5a370e80b33..2fe5da22b9a 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -207,16 +207,21 @@ dblink_get_conn(char *conname_or_str, * 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 establish connection"), 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 establish connection"), + 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 = PQconnectdb(connstr); @@ -310,16 +315,21 @@ dblink_connect(PG_FUNCTION_ARGS) * 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 establish connection"), 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 establish connection"), + 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 = PQconnectdb(connstr); |