===================================================================
RCS file: /cvs/mandoc/compat_fts.c,v
retrieving revision 1.13
retrieving revision 1.15
diff -u -p -r1.13 -r1.15
--- mandoc/compat_fts.c	2017/02/15 15:58:46	1.13
+++ mandoc/compat_fts.c	2020/06/14 22:49:36	1.15
@@ -6,8 +6,8 @@ int dummy;
 
 #else
 
-/*	$Id: compat_fts.c,v 1.13 2017/02/15 15:58:46 schwarze Exp $	*/
-/*	$OpenBSD: compat_fts.c,v 1.13 2017/02/15 15:58:46 schwarze Exp $	*/
+/*	$Id: compat_fts.c,v 1.15 2020/06/14 22:49:36 schwarze Exp $	*/
+/*	$OpenBSD: compat_fts.c,v 1.15 2020/06/14 22:49:36 schwarze Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -62,16 +62,12 @@ static int	 fts_palloc(FTS *, size_t);
 static FTSENT	*fts_sort(FTS *, FTSENT *, int);
 static unsigned short	 fts_stat(FTS *, FTSENT *);
 
+typedef int (*qsort_compar_proto)(const void *, const void *);
+
 #define	ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
-#ifndef	O_DIRECTORY
-#define	O_DIRECTORY	0
-#endif
 #ifndef	O_CLOEXEC
 #define	O_CLOEXEC	0
 #endif
-#ifndef	PATH_MAX
-#define	PATH_MAX	4096
-#endif
 
 #define	CLR(opt)	(sp->fts_options &= ~(opt))
 #define	ISSET(opt)	(sp->fts_options & (opt))
@@ -591,7 +587,8 @@ fts_sort(FTS *sp, FTSENT *head, int nitems)
 	}
 	for (ap = sp->fts_array, p = head; p; p = p->fts_link)
 		*ap++ = p;
-	qsort(sp->fts_array, nitems, sizeof(FTSENT *), sp->fts_compar);
+	qsort(sp->fts_array, nitems, sizeof(FTSENT *),
+	    (qsort_compar_proto)sp->fts_compar);
 	for (head = *(ap = sp->fts_array); --nitems; ++ap)
 		ap[0]->fts_link = ap[1];
 	ap[0]->fts_link = NULL;