From 6f3efa76b042cdc457dba5bf8d8257f3ae83fb10 Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Sat, 26 Mar 2011 00:10:07 -0300 Subject: [PATCH] Remove rel.h from objectaddress.h; only relcache.h is necessary. Add rel.h to some files that now need it. --- contrib/dummy_seclabel/dummy_seclabel.c | 1 + src/backend/catalog/pg_collation.c | 1 + src/backend/commands/collationcmds.c | 1 + src/backend/commands/comment.c | 1 + src/backend/commands/seclabel.c | 1 + src/include/catalog/objectaddress.h | 2 +- 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/dummy_seclabel/dummy_seclabel.c b/contrib/dummy_seclabel/dummy_seclabel.c index 5deb43fa9b..2979fecd06 100644 --- a/contrib/dummy_seclabel/dummy_seclabel.c +++ b/contrib/dummy_seclabel/dummy_seclabel.c @@ -14,6 +14,7 @@ #include "commands/seclabel.h" #include "miscadmin.h" +#include "utils/rel.h" PG_MODULE_MAGIC; diff --git a/src/backend/catalog/pg_collation.c b/src/backend/catalog/pg_collation.c index 5b92a4c0c2..28a016b972 100644 --- a/src/backend/catalog/pg_collation.c +++ b/src/backend/catalog/pg_collation.c @@ -26,6 +26,7 @@ #include "mb/pg_wchar.h" #include "utils/builtins.h" #include "utils/fmgroids.h" +#include "utils/rel.h" #include "utils/syscache.h" #include "utils/tqual.h" diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c index 7f8a108374..9e6138b92a 100644 --- a/src/backend/commands/collationcmds.c +++ b/src/backend/commands/collationcmds.c @@ -31,6 +31,7 @@ #include "utils/builtins.h" #include "utils/lsyscache.h" #include "utils/pg_locale.h" +#include "utils/rel.h" #include "utils/syscache.h" static void AlterCollationOwner_internal(Relation rel, Oid collationOid, diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c index de4d5ded68..200b6a22cc 100644 --- a/src/backend/commands/comment.c +++ b/src/backend/commands/comment.c @@ -25,6 +25,7 @@ #include "miscadmin.h" #include "utils/builtins.h" #include "utils/fmgroids.h" +#include "utils/rel.h" #include "utils/tqual.h" diff --git a/src/backend/commands/seclabel.c b/src/backend/commands/seclabel.c index 51a5567a01..6e7e9c2976 100644 --- a/src/backend/commands/seclabel.c +++ b/src/backend/commands/seclabel.c @@ -23,6 +23,7 @@ #include "utils/fmgroids.h" #include "utils/lsyscache.h" #include "utils/memutils.h" +#include "utils/rel.h" #include "utils/tqual.h" typedef struct diff --git a/src/include/catalog/objectaddress.h b/src/include/catalog/objectaddress.h index 300b81d1f6..2da6309054 100644 --- a/src/include/catalog/objectaddress.h +++ b/src/include/catalog/objectaddress.h @@ -15,7 +15,7 @@ #include "nodes/parsenodes.h" #include "storage/lock.h" -#include "utils/rel.h" +#include "utils/relcache.h" /* * An ObjectAddress represents a database object of any type. -- 2.11.0