From a63d21dde30a8fa447b23c76761b0dc6d28c8387 Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Wed, 29 May 2013 22:48:10 +0000
Subject: Sync to OpenBSD: * Guard <sys/param.h> inclusion by #ifdef
 USE_MANPATH   to make it more obvious why this isn't needed on OpenBSD.  
 Noticed by deraadt@. * Resolve gratuitious whitespace differences:   Blanks
 before tabs and on empty lines.

---
 manpath.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/manpath.c b/manpath.c
index e22aa926..888c8db5 100644
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/*	$Id: manpath.c,v 1.9 2012/06/08 10:32:40 kristaps Exp $ */
+/*	$Id: manpath.c,v 1.10 2013/05/29 22:48:10 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -19,7 +19,9 @@
 #include "config.h"
 #endif
 
+#ifdef	USE_MANPATH
 #include <sys/param.h>
+#endif
 
 #include <assert.h>
 #include <ctype.h>
@@ -90,8 +92,8 @@ manpath_parse(struct manpaths *dirs, const char *file,
 	char		*insert;
 
 	/* Always prepend -m. */
- 	manpath_parseline(dirs, auxp);
- 
+	manpath_parseline(dirs, auxp);
+
 	/* If -M is given, it overrides everything else. */
 	if (NULL != defp) {
 		manpath_parseline(dirs, defp);
-- 
cgit v1.2.3-56-ge451