*** pgsql/contrib/pg_upgrade/pg_upgrade.h	2010/05/13 22:51:00	1.4
--- pgsql/contrib/pg_upgrade/pg_upgrade.h	2010/05/14 00:13:38	1.5
***************
*** 16,23 ****
  #include "libpq-fe.h"
  
  /* Allocate for null byte */
- #define NAMEDATASIZE		(NAMEDATALEN + 1)
- 
  #define USER_NAME_SIZE		128
  
  #define MAX_STRING			1024
--- 16,21 ----
*************** extern int  pgunlink(const char *path);
*** 73,87 ****
  extern void copydir(char *fromdir, char *todir, bool recurse);
  extern bool rmtree(const char *path, bool rmtopdir);
  
- extern char pathSeparator;
- 
  /*
   * Each relation is represented by a relinfo structure.
   */
  typedef struct
  {
! 	char		nspname[NAMEDATASIZE];		/* namespace name */
! 	char		relname[NAMEDATASIZE];		/* relation name */
  	Oid			reloid;			/* relation oid				 */
  	Oid			relfilenode;	/* relation relfile node	 */
  	Oid			toastrelid;		/* oid of the toast relation */
--- 71,83 ----
  extern void copydir(char *fromdir, char *todir, bool recurse);
  extern bool rmtree(const char *path, bool rmtopdir);
  
  /*
   * Each relation is represented by a relinfo structure.
   */
  typedef struct
  {
! 	char		nspname[NAMEDATALEN];		/* namespace name */
! 	char		relname[NAMEDATALEN];		/* relation name */
  	Oid			reloid;			/* relation oid				 */
  	Oid			relfilenode;	/* relation relfile node	 */
  	Oid			toastrelid;		/* oid of the toast relation */
*************** typedef struct
*** 103,112 ****
  	Oid			new;			/* Relfilenode of the new relation */
  	char		old_file[MAXPGPATH];
  	char		new_file[MAXPGPATH];
! 	char		old_nspname[NAMEDATASIZE];	/* old name of the namespace */
! 	char		old_relname[NAMEDATASIZE];	/* old name of the relation */
! 	char		new_nspname[NAMEDATASIZE];	/* new name of the namespace */
! 	char		new_relname[NAMEDATASIZE];	/* new name of the relation */
  } FileNameMap;
  
  /*
--- 99,108 ----
  	Oid			new;			/* Relfilenode of the new relation */
  	char		old_file[MAXPGPATH];
  	char		new_file[MAXPGPATH];
! 	char		old_nspname[NAMEDATALEN];	/* old name of the namespace */
! 	char		old_relname[NAMEDATALEN];	/* old name of the relation */
! 	char		new_nspname[NAMEDATALEN];	/* new name of the namespace */
! 	char		new_relname[NAMEDATALEN];	/* new name of the relation */
  } FileNameMap;
  
  /*
*************** typedef struct
*** 115,121 ****
  typedef struct
  {
  	Oid			db_oid;			/* oid of the database */
! 	char		db_name[NAMEDATASIZE];	/* database name */
  	char		db_tblspace[MAXPGPATH]; /* database default tablespace path */
  	RelInfoArr	rel_arr;		/* array of all user relinfos */
  } DbInfo;
--- 111,117 ----
  typedef struct
  {
  	Oid			db_oid;			/* oid of the database */
! 	char		db_name[NAMEDATALEN];	/* database name */
  	char		db_tblspace[MAXPGPATH]; /* database default tablespace path */
  	RelInfoArr	rel_arr;		/* array of all user relinfos */
  } DbInfo;