resolve conflicts

Author: funbringer

src/include/compat/pg_compat.h

@@ -826,6 +826,18 @@ extern AttrNumber *convert_tuples_by_name_map(TupleDesc indesc,
 #endif
 
 
+/*
+ * HeapTupleGetXmin()
+ * Vanilla PostgreSQL has HeaptTupleHeaderGetXmin, but for 64-bit xid
+ * we need access to entire tuple, not just its header.
+ */
+#ifdef XID_IS_64BIT
+# define HeapTupleGetXminCompat(htup) HeapTupleGetXmin(htup)
+#else
+# define HeapTupleGetXminCompat(htup) HeapTupleHeaderGetXmin((htup)->t_data)
+#endif
+
+
 /*
  * -------------
  *  Common code

src/init.c

@@ -657,7 +657,7 @@ pathman_config_contains_relation(Oid relid, Datum *values, bool *isnull,
 
 		/* Set xmin if necessary */
 		if (xmin)
-			*xmin = HeapTupleHeaderGetXmin(htup->t_data);
+			*xmin = HeapTupleGetXminCompat(htup);
 
 		/* Set ItemPointer if necessary */
 		if (iptr)