===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.231
retrieving revision 1.234
diff -u -p -r1.231 -r1.234
--- mandoc/mandocdb.c	2016/10/18 14:15:33	1.231
+++ mandoc/mandocdb.c	2016/10/22 10:09:27	1.234
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.231 2016/10/18 14:15:33 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.234 2016/10/22 10:09:27 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2016 Ingo Schwarze <schwarze@openbsd.org>
@@ -120,7 +120,11 @@ static	void	 dbadd_mlink(const struct mlink *mlink);
 static	void	 dbprune(struct dba *);
 static	void	 dbwrite(struct dba *);
 static	void	 filescan(const char *);
+#if HAVE_FTS_COMPARE_CONST
+static	int	 fts_compare(const FTSENT *const *, const FTSENT *const *);
+#else
 static	int	 fts_compare(const FTSENT **, const FTSENT **);
+#endif
 static	void	 mlink_add(struct mlink *, const struct stat *);
 static	void	 mlink_check(struct mpage *, struct mlink *);
 static	void	 mlink_free(struct mlink *);
@@ -547,7 +551,11 @@ usage:
  * at the beginning, process directory entries in reverse alpha order.
  */
 static int
+#if HAVE_FTS_COMPARE_CONST
+fts_compare(const FTSENT *const *a, const FTSENT *const *b)
+#else
 fts_compare(const FTSENT **a, const FTSENT **b)
+#endif
 {
 	return -strcmp((*a)->fts_name, (*b)->fts_name);
 }
@@ -1731,7 +1739,8 @@ putkeys(const struct mpage *mpage, char *cp, size_t sz
 			name_mask &= ~NAME_FIRST;
 		if (debug > 1)
 			say(mpage->mlinks->file,
-			    "Adding name %*s, bits=0x%llu", (int)sz, cp, v);
+			    "Adding name %*s, bits=0x%llx", (int)sz, cp,
+			    (unsigned long long)v);
 	} else {
 		htab = &strings;
 		if (debug > 1)