diff options
| author | Bruce Momjian <bruce@momjian.us> | 2010-06-15 02:08:01 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2010-06-15 02:08:01 +0000 |
| commit | 8141523e35fd0c5c069abd0403b5c99770abd6fb (patch) | |
| tree | 839169295eda640ffda8bcf6e63b624c7b268bb8 | |
| parent | 6bbaa3148d65b3bed987c40b78e2b9a55bdfab58 (diff) | |
| download | postgresql-8141523e35fd0c5c069abd0403b5c99770abd6fb.tar.gz postgresql-8141523e35fd0c5c069abd0403b5c99770abd6fb.zip | |
Properly define pg_upgrade global variable, per bug report from Chris
Ruprecht on Mac (64 bit).
| -rw-r--r-- | contrib/pg_upgrade/pg_upgrade.h | 2 | ||||
| -rw-r--r-- | contrib/pg_upgrade/relfilenode.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/contrib/pg_upgrade/pg_upgrade.h b/contrib/pg_upgrade/pg_upgrade.h index db56601e9a5..34376047f7c 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 d5a8dcb3cab..e457dfb5902 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() * |