Log Message:-----------Get rid of some more stuff that duplicates c.h or port.h.
Modified Files:-------------- pgsql/contrib/pg_upgrade: controldata.c (r1.4 -> r1.5) (http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/contrib/pg_upgrade/controldata.c?r1=1.4&r2=1.5) file.c (r1.8 -> r1.9) (http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/contrib/pg_upgrade/file.c?r1=1.8&r2=1.9) pg_upgrade.h (r1.10 -> r1.11) (http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/contrib/pg_upgrade/pg_upgrade.h?r1=1.10&r2=1.11)