diff options
| -rw-r--r-- | src/backend/postmaster/postmaster.c | 4 | ||||
| -rw-r--r-- | src/bin/pg_upgrade/controldata.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c index 0edd7f1dc7..71ffb1345b 100644 --- a/src/backend/postmaster/postmaster.c +++ b/src/backend/postmaster/postmaster.c @@ -2371,7 +2371,11 @@ processCancelRequest(Port *port, void *pkt) backendPID))); return; } +#ifndef EXEC_BACKEND /* make GNU Emacs 26.1 see brace balance */ } +#else + } +#endif /* No matching backend */ ereport(LOG, diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c index fa43db4019..bbeba673d4 100644 --- a/src/bin/pg_upgrade/controldata.c +++ b/src/bin/pg_upgrade/controldata.c @@ -102,12 +102,11 @@ get_control_data(ClusterInfo *cluster, bool live_check) pg_putenv("LC_MONETARY", NULL); pg_putenv("LC_NUMERIC", NULL); pg_putenv("LC_TIME", NULL); - pg_putenv("LANG", #ifndef WIN32 - NULL); + pg_putenv("LANG", NULL); #else /* On Windows the default locale cannot be English, so force it */ - "en"); + pg_putenv("LANG", "en"); #endif pg_putenv("LANGUAGE", NULL); pg_putenv("LC_ALL", NULL); |