diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index db56601e9a..34376047f7 100644
--- a/contrib/pg_upgrade/pg_upgrade.h
+++ b/contrib/pg_upgrade/pg_upgrade.h
@@ -237,7 +237,7 @@ typedef struct
 /*
  * Global variables
  */
-char		scandir_file_pattern[MAXPGPATH];
+extern char		scandir_file_pattern[];
 
 
 /* check.c */
diff --git a/contrib/pg_upgrade/relfilenode.c b/contrib/pg_upgrade/relfilenode.c
index d5a8dcb3ca..e457dfb590 100644
--- a/contrib/pg_upgrade/relfilenode.c
+++ b/contrib/pg_upgrade/relfilenode.c
@@ -17,6 +17,9 @@ static void transfer_relfile(migratorContext *ctx, pageCnvCtx *pageConverter,
 				 const char *oldnspname, const char *oldrelname,
 				 const char *newnspname, const char *newrelname);
 
+/* used by scandir(), must be global */
+char     scandir_file_pattern[MAXPGPATH];
+				 
 /*
  * transfer_all_new_dbs()
  *