From c1654e5128f96e284f8c7cfce1029b36677a6fd2 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 29 May 2013 22:48:10 +0000 Subject: Sync to OpenBSD: * Guard 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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'manpath.c') 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 +#endif #include #include @@ -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