fixup

Author: macdice

src/include/lib/xlist_template.h

@@ -269,7 +269,7 @@ typedef struct XLIST_head
 #endif
 } XLIST_head;
 
-#endif							/* XLIST_ */
+#endif							/* XLIST_DECLARED */
 
 
 
@@ -366,9 +366,9 @@ XLIST_move_ptrdiff(XLIST_link_t link, XLIST_node *old_base, XLIST_node *new_base
 }
 
 static inline XLIST_node *
-XLIST_read_ptrdiff(XLIST_node *node, XLIST_link_t link)
+XLIST_read_ptrdiff(XLIST_node *base, XLIST_link_t link)
 {
-	return (XLIST_node *) ((char *) node + (link * XLIST_PTRDIFF_SCALE));
+	return (XLIST_node *) ((char *) base + (link * XLIST_PTRDIFF_SCALE));
 }
 
 #endif

src/test/regress/regress_xlist.c

@@ -173,7 +173,9 @@ struct dlist_ptrdiff_cont
 static void
 test_dlist_ptrdiff_arithmetic(void)
 {
+#ifdef USE_ASSERT_CHECKING
 	size_t scale = alignof(dlist_ptrdiff_node);
+#endif
 	struct dlist_ptrdiff_cont array[8] = {0};
 
 	/* Pointing next to the node itself stores 0. */

src/tools/pginclude/headerscheck

@@ -129,6 +129,7 @@ do
 	# These files are not meant to be included standalone, because
 	# they contain lists that might have multiple use-cases.
 	test "$f" = src/include/access/rmgrlist.h && continue
+	test "$f" = src/include/lib/xlist_template.h && continue
 	test "$f" = src/include/parser/kwlist.h && continue
 	test "$f" = src/include/postmaster/proctypelist.h && continue
 	test "$f" = src/include/regex/regerrs.h && continue