Make our back branches build under -fkeep-inline-functions.

Add "#ifndef FRONTEND" where necessary to make pg_waldump build
on compilers that don't elide unused static-inline functions.

This back-patches relevant parts of commit 3e9ca5260, fixing build
breakage from dc7420c2c and back-patching of f10f0ae42.

Per recently-resurrected buildfarm member castoroides.  We aren't
expecting castoroides to build anything newer than v11, but we
might as well clean up the intermediate branches while at it.

diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 49920da509f5fe3b04aaa3a380e05e530b5c5dd3..f2d53c92e50e14715ab2f85dbe1265f40da59174 100644 (file)
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -526,6 +526,7 @@ typedef struct ViewOptions
        (RELKIND_HAS_STORAGE((relation)->rd_rel->relkind) && \
         ((relation)->rd_rel->relfilenode == InvalidOid))
 
+#ifndef FRONTEND
 /*
  * RelationGetSmgr
  *             Returns smgr file handle for a relation, opening it if needed.
@@ -546,6 +547,7 @@ RelationGetSmgr(Relation rel)
                smgrsetowner(&(rel->rd_smgr), smgropen(rel->rd_node, rel->rd_backend));
        return rel->rd_smgr;
 }
+#endif                                                 /* !FRONTEND */
 
 /*
  * RelationOpenSmgr

diff --git a/src/include/utils/snapmgr.h b/src/include/utils/snapmgr.h
index c6a176cc95de4335020682b7583977d9d17feb0d..33e6c14e819e5d14df8aa22f2383411bd4816978 100644 (file)
--- a/src/include/utils/snapmgr.h
+++ b/src/include/utils/snapmgr.h
@@ -97,11 +97,13 @@ extern PGDLLIMPORT SnapshotData CatalogSnapshotData;
        ((snapshot)->snapshot_type == SNAPSHOT_MVCC || \
         (snapshot)->snapshot_type == SNAPSHOT_HISTORIC_MVCC)
 
+#ifndef FRONTEND
 static inline bool
 OldSnapshotThresholdActive(void)
 {
        return old_snapshot_threshold >= 0;
 }
+#endif
 
 extern Snapshot GetTransactionSnapshot(void);
 extern Snapshot GetLatestSnapshot(void);