Properly define pg_upgrade global variable, per bug report from Chris

Ruprecht on Mac (64 bit).

diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h
index db56601e9a5577587090d4c8efcc970604a13a18..34376047f7cf3d24218ab3e8bb2b286c074578ee 100644 (file)
--- 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 d5a8dcb3cab5fdaa02f598c3318dceea45a748e5..e457dfb59024c3ecb6fee9a1d165208e338d5a0d 100644 (file)
--- 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()
  *