Fix assorted inconsistent function declarations.

While gcc doesn't complain if you declare a function "static" and then
define it not-static, other compilers do; and in any case the code is
highly misleading this way.  Add the missing "static" keywords to a
couple of recent patches.  Per buildfarm member pademelon.

diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
index 430e74e5f95eaabe89d803ef1f5e8f5095a166b1..0dd7de6337d5ffc3e3c9551a50e8d789d7fee536 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -293,7 +293,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, const char
 }
 #endif
 
-void
+static void
 get_restricted_token(const char *progname)
 {
 #ifdef WIN32

diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
index 1ade239e11a38400892b1e54d59b64ed61ef343c..5aa6b6c5e3b341e696cac56a3594761fcca4e23b 100644 (file)
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -1191,7 +1191,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, const char
 }
 #endif
 
-void
+static void
 get_restricted_token(const char *progname)
 {
 #ifdef WIN32