Commit 90e7f317 authored by Noah Misch's avatar Noah Misch

Use preprocessor conditions compatible with Emacs indent.

Emacs wrongly indented hundreds of subsequent lines.
parent e481d262
...@@ -2371,7 +2371,11 @@ processCancelRequest(Port *port, void *pkt) ...@@ -2371,7 +2371,11 @@ processCancelRequest(Port *port, void *pkt)
backendPID))); backendPID)));
return; return;
} }
#ifndef EXEC_BACKEND /* make GNU Emacs 26.1 see brace balance */
} }
#else
}
#endif
/* No matching backend */ /* No matching backend */
ereport(LOG, ereport(LOG,
......
...@@ -102,12 +102,11 @@ get_control_data(ClusterInfo *cluster, bool live_check) ...@@ -102,12 +102,11 @@ get_control_data(ClusterInfo *cluster, bool live_check)
pg_putenv("LC_MONETARY", NULL); pg_putenv("LC_MONETARY", NULL);
pg_putenv("LC_NUMERIC", NULL); pg_putenv("LC_NUMERIC", NULL);
pg_putenv("LC_TIME", NULL); pg_putenv("LC_TIME", NULL);
pg_putenv("LANG",
#ifndef WIN32 #ifndef WIN32
NULL); pg_putenv("LANG", NULL);
#else #else
/* On Windows the default locale cannot be English, so force it */ /* On Windows the default locale cannot be English, so force it */
"en"); pg_putenv("LANG", "en");
#endif #endif
pg_putenv("LANGUAGE", NULL); pg_putenv("LANGUAGE", NULL);
pg_putenv("LC_ALL", NULL); pg_putenv("LC_ALL", NULL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment