===================================================================
RCS file: /cvs/mandoc/compat_fts.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- mandoc/compat_fts.c	2014/12/11 18:20:07	1.6
+++ mandoc/compat_fts.c	2015/02/07 07:42:56	1.7
@@ -6,8 +6,8 @@ int dummy;
 
 #else
 
-/*	$Id: compat_fts.c,v 1.6 2014/12/11 18:20:07 schwarze Exp $	*/
-/*	$OpenBSD: compat_fts.c,v 1.6 2014/12/11 18:20:07 schwarze Exp $	*/
+/*	$Id: compat_fts.c,v 1.7 2015/02/07 07:42:56 schwarze Exp $	*/
+/*	$OpenBSD: compat_fts.c,v 1.7 2015/02/07 07:42:56 schwarze Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993, 1994
@@ -38,7 +38,6 @@ int dummy;
  * SUCH DAMAGE.
  */
 
-#include <sys/param.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -51,6 +50,8 @@ int dummy;
 #include <unistd.h>
 #include "compat_fts.h"
 
+#define MAXIMUM(a, b)	(((a) > (b)) ? (a) : (b))
+
 static FTSENT	*fts_alloc(FTS *, const char *, size_t);
 static FTSENT	*fts_build(FTS *);
 static void	 fts_lfree(FTSENT *);
@@ -62,7 +63,6 @@ static unsigned short	 fts_stat(FTS *, FTSENT *);
 static int	 fts_safe_changedir(FTS *, FTSENT *, int, const char *);
 
 #define	ISDOT(a)	(a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2])))
-#define	MAX(a,b)	(((a)>(b))?(a):(b))
 #ifndef	O_DIRECTORY
 #define	O_DIRECTORY	0
 #endif
@@ -97,7 +97,7 @@ fts_open(char * const *argv, int options, void *dummy)
 	 * Start out with 1K of path space, and enough, in any case,
 	 * to hold the user's paths.
 	 */
-	if (fts_palloc(sp, MAX(fts_maxarglen(argv), PATH_MAX)))
+	if (fts_palloc(sp, MAXIMUM(fts_maxarglen(argv), PATH_MAX)))
 		goto mem1;
 
 	/* Allocate/initialize root's parent. */