Merge pull request #46 from postgrespro/master-merge

Master merge

Author: Ogurezzz

ptrack.c

@@ -25,6 +25,10 @@
 
 #include "postgres.h"
 
+#if PG_VERSION_NUM >= 190000
+#include <dirent.h>
+#endif
+
 #include <unistd.h>
 #include <sys/stat.h>
 
@@ -45,6 +49,10 @@
 #endif
 #include "storage/smgr.h"
 #include "storage/reinit.h"
+#if PG_VERSION_NUM >= 190000
+#include "storage/fd.h"
+#include "storage/shmem.h"
+#endif
 #include "utils/builtins.h"
 #include "utils/guc.h"
 #include "utils/pg_lsn.h"
@@ -264,7 +272,7 @@ ptrack_mdextend_hook(RelFileNodeBackend smgr_rnode,
 }
 
 static void
-ptrack_ProcessSyncRequests_hook()
+ptrack_ProcessSyncRequests_hook(void)
 {
 	ptrackCheckpoint();
 
@@ -561,6 +569,9 @@ ptrack_get_pagemapset(PG_FUNCTION_ARGS)
 		TupleDescInitEntry(tupdesc, (AttrNumber) 1, "path", TEXTOID, -1, 0);
 		TupleDescInitEntry(tupdesc, (AttrNumber) 2, "pagecount", INT8OID, -1, 0);
 		TupleDescInitEntry(tupdesc, (AttrNumber) 3, "pagemap", BYTEAOID, -1, 0);
+#if PG_VERSION_NUM >= 190000
+		TupleDescFinalize(tupdesc);
+#endif
 		funcctx->tuple_desc = BlessTupleDesc(tupdesc);
 
 		funcctx->user_fctx = ctx;