From 8141523e35fd0c5c069abd0403b5c99770abd6fb Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 15 Jun 2010 02:08:01 +0000 Subject: [PATCH] Properly define pg_upgrade global variable, per bug report from Chris Ruprecht on Mac (64 bit). --- contrib/pg_upgrade/pg_upgrade.h | 2 +- contrib/pg_upgrade/relfilenode.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) 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() * -- 2.40.0