[Tom Lane <tgl@sss.pgh.pa.us>]

Merge catalog/pg_foo_fn.h headers back into pg_foo.h headers.

Traditionally, include/catalog/pg_foo.h contains extern declarations
for functions in backend/catalog/pg_foo.c, in addition to its function
as the authoritative definition of the pg_foo catalog's rowtype.
In some cases, we'd been forced to split out those extern declarations
into separate pg_foo_fn.h headers so that the catalog definitions
could be #include'd by frontend code.  That problem is gone as of
commit 9c0a0de4c, so let's undo the splits to make things less
confusing.

Discussion: https://postgr.es/m/23690.1523031777@sss.pgh.pa.us

Branch
------
master

Details
-------
https://git.postgresql.org/pg/commitdiff/cefa3871534d2c467a520820c0ae3f002a46d8e4

Modified Files
--------------
contrib/sepgsql/dml.c                       |   2 +-
src/backend/catalog/dependency.c            |   3 -
src/backend/catalog/heap.c                  |   2 -
src/backend/catalog/index.c                 |   3 +-
src/backend/catalog/namespace.c             |   1 -
src/backend/catalog/objectaddress.c         |   1 -
src/backend/catalog/partition.c             |   1 -
src/backend/catalog/pg_aggregate.c          |   2 -
src/backend/catalog/pg_collation.c          |   1 -
src/backend/catalog/pg_constraint.c         |   1 -
src/backend/catalog/pg_conversion.c         |   1 -
src/backend/catalog/pg_inherits.c           |   1 -
src/backend/catalog/pg_operator.c           |   1 -
src/backend/catalog/pg_proc.c               |   3 +-
src/backend/catalog/pg_type.c               |   1 -
src/backend/commands/aggregatecmds.c        |   1 -
src/backend/commands/analyze.c              |   2 +-
src/backend/commands/collationcmds.c        |   1 -
src/backend/commands/conversioncmds.c       |   1 -
src/backend/commands/functioncmds.c         |   2 -
src/backend/commands/indexcmds.c            |   3 +-
src/backend/commands/lockcmds.c             |   2 +-
src/backend/commands/operatorcmds.c         |   1 -
src/backend/commands/proclang.c             |   1 -
src/backend/commands/publicationcmds.c      |   2 +-
src/backend/commands/tablecmds.c            |   3 -
src/backend/commands/trigger.c              |   3 +-
src/backend/commands/typecmds.c             |   3 -
src/backend/commands/vacuum.c               |   2 +-
src/backend/executor/execPartition.c        |   2 +-
src/backend/optimizer/plan/planner.c        |   2 +-
src/backend/optimizer/prep/prepunion.c      |   2 +-
src/backend/parser/parse_agg.c              |   2 +-
src/backend/parser/parse_clause.c           |   2 +-
src/backend/parser/parse_coerce.c           |   2 +-
src/backend/parser/parse_utilcmd.c          |   1 -
src/backend/rewrite/rowsecurity.c           |   2 +-
src/backend/tcop/utility.c                  |   2 +-
src/include/catalog/pg_aggregate.h          |  36 ++++++++++
src/include/catalog/pg_aggregate_fn.h       |  52 --------------
src/include/catalog/pg_collation.h          |  11 +++
src/include/catalog/pg_collation_fn.h       |  27 --------
src/include/catalog/pg_constraint.h         |  88 +++++++++++++++++++++++
src/include/catalog/pg_constraint_fn.h      | 104 ----------------------------
src/include/catalog/pg_conversion.h         |  11 +++
src/include/catalog/pg_conversion_fn.h      |  27 --------
src/include/catalog/pg_db_role_setting.h    |   1 +
src/include/catalog/pg_enum.h               |   1 +
src/include/catalog/pg_inherits.h           |  14 ++++
src/include/catalog/pg_inherits_fn.h        |  30 --------
src/include/catalog/pg_operator.h           |  20 ++++++
src/include/catalog/pg_operator_fn.h        |  36 ----------
src/include/catalog/pg_proc.h               |  34 +++++++++
src/include/catalog/pg_proc_fn.h            |  50 -------------
src/include/catalog/pg_publication.h        |   1 +
src/include/catalog/pg_replication_origin.h |   1 +
src/include/catalog/pg_subscription.h       |   1 +
src/include/catalog/pg_subscription_rel.h   |   1 +
src/include/catalog/pg_type.h               |  67 ++++++++++++++++++
src/include/catalog/pg_type_fn.h            |  84 ----------------------
src/pl/plperl/plperl.c                      |   1 -
src/pl/plpgsql/src/pl_comp.c                |   1 -
src/pl/plpython/plpy_procedure.c            |   1 -
63 files changed, 304 insertions(+), 464 deletions(-)