summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorTom Lane2018-04-09 18:39:58 +0000
committerTom Lane2018-04-09 18:39:58 +0000
commitaf1a949109d8212711df943c053b1038c0afdae1 (patch)
tree3d532e1bcd3ce3dfd1fa7dbb41480e25d342981e /contrib
parentf5543d47bcb2fee2ab69220f51e2078c11e19843 (diff)
Further cleanup of client dependencies on src/include/catalog headers.
In commit 9c0a0de4c, I'd failed to notice that catalog/catalog.h should also be considered a frontend-unsafe header, because it includes (and needs) the full form of pg_class.h, not to mention relcache.h. However, various frontend code was depending on it to get TABLESPACE_VERSION_DIRECTORY, so refactoring of some sort is called for. The cleanest answer seems to be to move TABLESPACE_VERSION_DIRECTORY, as well as the OIDCHARS symbol, to common/relpath.h. Do that, and mop up inclusions as necessary. (I found that quite a few current users of catalog/catalog.h don't seem to need it at all anymore, apparently as a result of the refactorings that created common/relpath.[hc]. And initdb.c needed it only as a route to pg_class_d.h.) Discussion: https://postgr.es/m/6629.1523294509@sss.pgh.pa.us
Diffstat (limited to 'contrib')
-rw-r--r--contrib/pageinspect/rawpage.c1
-rw-r--r--contrib/pg_prewarm/pg_prewarm.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
index 3d4d4f6f93..72f1d21e1b 100644
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@@ -18,7 +18,6 @@
#include "pageinspect.h"
#include "access/htup_details.h"
-#include "catalog/catalog.h"
#include "catalog/namespace.h"
#include "catalog/pg_type.h"
#include "funcapi.h"
diff --git a/contrib/pg_prewarm/pg_prewarm.c b/contrib/pg_prewarm/pg_prewarm.c
index 7f084462b1..3cbb7c2b88 100644
--- a/contrib/pg_prewarm/pg_prewarm.c
+++ b/contrib/pg_prewarm/pg_prewarm.c
@@ -16,7 +16,6 @@
#include <unistd.h>
#include "access/heapam.h"
-#include "catalog/catalog.h"
#include "fmgr.h"
#include "miscadmin.h"
#include "storage/bufmgr.h"