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 89e427503a70604a12994a2ff0f9b9d6b6d9f130..35a0f4304d1c2a0d644052b51529d011fc3fdbbd 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -289,7 +289,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 24de764f5c998f659e6db663d21526ed49ff2923..f0296dbcd900c66ac3ab91b5147c47c33682a20f 100644 (file)
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -1155,7 +1155,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, const char
 }
 #endif
 
-void
+static void
 get_restricted_token(const char *progname)
 {
 #ifdef WIN32