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 045ac3eebafa00d91eb77fc0d82805f7b06c854a..c4f71ba5c195dd03c2f2a1c2c1e129b5faa4be89 100644 (file)
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -223,7 +223,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 d83c02923edd494a6cc350d5ab751f047f318250..7e39916984e15f4358d1e6ee48861f4476a47ca8 100644 (file)
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -1151,7 +1151,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, const char
 }
 #endif
 
-void
+static void
 get_restricted_token(const char *progname)
 {
 #ifdef WIN32