Use preprocessor conditions compatible with Emacs indent.

Emacs wrongly indented hundreds of subsequent lines.

diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 0edd7f1dc7f434e8eea17e91743943dcb0bff333..71ffb1345b65d85fada027bf6ead236eea12702c 100644 (file)
--- 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 fa43db401913006acc3e1f1a7f641cad966517a6..bbeba673d478e2705b88d496020c13b4dd3c9d95 100644 (file)
--- 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);