From b1145ca19819ae0d64ef9a3cfd0ed94d300389b3 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 7 Apr 2015 16:56:21 -0400
Subject: [PATCH] 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.
---
 contrib/pg_upgrade/pg_upgrade.c     | 2 +-
 src/bin/pg_resetxlog/pg_resetxlog.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/pg_upgrade/pg_upgrade.c b/contrib/pg_upgrade/pg_upgrade.c
index 55b03bcd512..c67ca19cb51 100644
--- a/contrib/pg_upgrade/pg_upgrade.c
+++ b/contrib/pg_upgrade/pg_upgrade.c
@@ -294,7 +294,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 3e25c3c34c5..34615fb1cd9 100644
--- a/src/bin/pg_resetxlog/pg_resetxlog.c
+++ b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -1147,7 +1147,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, const char
 }
 #endif
 
-void
+static void
 get_restricted_token(const char *progname)
 {
 #ifdef WIN32