Fix portability problem induced by commit a6f6b78.

tglsfdc · tglsfdc · commit 6b85d4ba9b09 · 2016-04-15T10:44:28.000-04:00
pg_xlogdump includes bufmgr.h.  With a compiler that emits code for
static inline functions even when they're unreferenced, that leads
to unresolved external references in the new static-inline version
of BufferGetPage().  So hide it with #ifndef FRONTEND, as we've done
for similar issues elsewhere.  Per buildfarm member pademelon.
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
@@ -4299,7 +4299,7 @@ IssuePendingWritebacks(WritebackContext *context)
  * For best performance, keep the tests that are fastest and/or most likely to
  * exclude a page from old snapshot testing near the front.
  */
-extern void
+void
 TestForOldSnapshot(Snapshot snapshot, Relation relation, Page page)
 {
 	Assert(relation != NULL);
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
@@ -252,6 +252,15 @@ extern void FreeAccessStrategy(BufferAccessStrategy strategy);
 
 /* inline functions */
 
+/*
+ * Although this header file is nominally backend-only, certain frontend
+ * programs like pg_xlogdump include it.  For compilers that emit static
+ * inline functions even when they're unused, that leads to unsatisfied
+ * external references; hence hide these with #ifndef FRONTEND.
+ */
+
+#ifndef FRONTEND
+
 /*
  * BufferGetPage
  *		Returns the page associated with a buffer.
@@ -272,4 +281,6 @@ BufferGetPage(Buffer buffer, Snapshot snapshot, Relation relation,
 	return page;
 }
 
-#endif
+#endif   /* FRONTEND */
+
+#endif   /* BUFMGR_H */

Original file line number	Diff line number	Diff line change
`@@ -4299,7 +4299,7 @@ IssuePendingWritebacks(WritebackContext *context)`
`4299`	`4299`	`* For best performance, keep the tests that are fastest and/or most likely to`
`4300`	`4300`	`* exclude a page from old snapshot testing near the front.`
`4301`	`4301`	`*/`
`4302`		`-extern void`
	`4302`	`+void`
`4303`	`4303`	`TestForOldSnapshot(Snapshot snapshot, Relation relation, Page page)`
`4304`	`4304`	`{`
`4305`	`4305`	`Assert(relation != NULL);`