Index: contrib/pg_upgrade/pg_upgrade.h
===================================================================
RCS file: /cvsroot/pgsql/contrib/pg_upgrade/pg_upgrade.h,v
retrieving revision 1.7
diff -c -c -r1.7 pg_upgrade.h
*** contrib/pg_upgrade/pg_upgrade.h	12 Jun 2010 17:45:28 -0000	1.7
--- contrib/pg_upgrade/pg_upgrade.h	15 Jun 2010 02:01:48 -0000
***************
*** 237,243 ****
  /*
   * Global variables
   */
! char		scandir_file_pattern[MAXPGPATH];
  
  
  /* check.c */
--- 237,243 ----
  /*
   * Global variables
   */
! extern char		scandir_file_pattern[];
  
  
  /* check.c */
Index: contrib/pg_upgrade/relfilenode.c
===================================================================
RCS file: /cvsroot/pgsql/contrib/pg_upgrade/relfilenode.c,v
retrieving revision 1.3
diff -c -c -r1.3 relfilenode.c
*** contrib/pg_upgrade/relfilenode.c	13 May 2010 22:51:00 -0000	1.3
--- contrib/pg_upgrade/relfilenode.c	15 Jun 2010 02:01:48 -0000
***************
*** 17,22 ****
--- 17,25 ----
  				 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()
   *