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.

1 files changed, 4 insertions, 2 deletions

diff --git a/manpath.c b/manpath.c
index 563965c0..e08e917a 100644
--- a/manpath.c
+++ b/manpath.c
@@ -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);