Properly define pg_upgrade global variable, per bug report from Chris

bmomjian · bmomjian · commit 8141523e35fd · 2010-06-15T02:08:01.000Z
Ruprecht on Mac (64 bit).
diff --git 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
@@ -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()
  *

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,9 @@ static void transfer_relfile(migratorContext ctx, pageCnvCtx pageConverter,`
`17`	`17`	`const char oldnspname, const char oldrelname,`
`18`	`18`	`const char newnspname, const char newrelname);`
`19`	`19`
	`20`	`+/* used by scandir(), must be global */`
	`21`	`+char scandir_file_pattern[MAXPGPATH];`
	`22`	`+`
`20`	`23`	`/*`
`21`	`24`	`* transfer_all_new_dbs()`
`22`	`25`	`*`