diff options
author | Ingo Schwarze <schwarze@openbsd.org> | 2015-11-07 14:22:29 +0000 |
---|---|---|
committer | Ingo Schwarze <schwarze@openbsd.org> | 2015-11-07 14:22:29 +0000 |
commit | b897019f5696c540f454bcb428d44ad31ef65559 (patch) | |
tree | 87824c81350783a7291c72cb46f46ac90518d9e0 | |
parent | e7e94cd5a1663f3e3046a449030b33f9bd0dba7b (diff) | |
download | mandoc-b897019f5696c540f454bcb428d44ad31ef65559.tar.gz mandoc-b897019f5696c540f454bcb428d44ad31ef65559.tar.zst mandoc-b897019f5696c540f454bcb428d44ad31ef65559.zip |
Without HAVE_ERR, don't try to include <err.h>, it probably isn't there.
In that case, the required prototypes are in "config.h".
Patch from Peter Bray <pdb_ml at yahoo dot com dot au>.
-rw-r--r-- | compat_err.c | 3 | ||||
-rw-r--r-- | compat_stringlist.c | 4 | ||||
-rw-r--r-- | main.c | 4 | ||||
-rw-r--r-- | mandoc_aux.c | 4 | ||||
-rw-r--r-- | mandocdb.c | 4 | ||||
-rw-r--r-- | manpath.c | 4 | ||||
-rw-r--r-- | mansearch.c | 4 | ||||
-rw-r--r-- | read.c | 4 | ||||
-rw-r--r-- | soelim.c | 4 | ||||
-rw-r--r-- | term_ps.c | 4 |
10 files changed, 28 insertions, 11 deletions
diff --git a/compat_err.c b/compat_err.c index 3a5bac03..fd6e11f4 100644 --- a/compat_err.c +++ b/compat_err.c @@ -6,7 +6,7 @@ int dummy; #else -/* $Id: compat_err.c,v 1.2 2015/11/06 16:30:33 schwarze Exp $ */ +/* $Id: compat_err.c,v 1.3 2015/11/07 14:22:29 schwarze Exp $ */ /* * Copyright (c) 1993 * The Regents of the University of California. All rights reserved. @@ -36,7 +36,6 @@ int dummy; * SUCH DAMAGE. */ -#include <err.h> #include <errno.h> #include <stdarg.h> #include <stdio.h> diff --git a/compat_stringlist.c b/compat_stringlist.c index b3397168..17eba772 100644 --- a/compat_stringlist.c +++ b/compat_stringlist.c @@ -6,7 +6,7 @@ int dummy; #else -/* $Id: compat_stringlist.c,v 1.5 2015/05/21 00:13:43 schwarze Exp $ */ +/* $Id: compat_stringlist.c,v 1.6 2015/11/07 14:22:29 schwarze Exp $ */ /* * Copyright (c) 1994 Christos Zoulas <christos@netbsd.org> * All rights reserved. @@ -33,7 +33,9 @@ int dummy; * SUCH DAMAGE. */ +#if HAVE_ERR #include <err.h> +#endif #include <stdlib.h> #include <string.h> #include "compat_stringlist.h" @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.255 2015/11/06 17:33:34 schwarze Exp $ */ +/* $Id: main.c,v 1.256 2015/11/07 14:22:29 schwarze Exp $ */ /* * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -24,7 +24,9 @@ #include <assert.h> #include <ctype.h> +#if HAVE_ERR #include <err.h> +#endif #include <fcntl.h> #include <glob.h> #include <signal.h> diff --git a/mandoc_aux.c b/mandoc_aux.c index fa72ba0d..cc74b7e7 100644 --- a/mandoc_aux.c +++ b/mandoc_aux.c @@ -1,4 +1,4 @@ -/* $Id: mandoc_aux.c,v 1.8 2015/11/06 16:30:33 schwarze Exp $ */ +/* $Id: mandoc_aux.c,v 1.9 2015/11/07 14:22:29 schwarze Exp $ */ /* * Copyright (c) 2009, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -19,7 +19,9 @@ #include <sys/types.h> +#if HAVE_ERR #include <err.h> +#endif #include <stdarg.h> #include <stdlib.h> #include <stdio.h> @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.207 2015/11/06 17:33:34 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.208 2015/11/07 14:22:29 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -23,7 +23,9 @@ #include <assert.h> #include <ctype.h> +#if HAVE_ERR #include <err.h> +#endif #include <errno.h> #include <fcntl.h> #if HAVE_FTS @@ -1,4 +1,4 @@ -/* $Id: manpath.c,v 1.27 2015/10/11 21:12:55 schwarze Exp $ */ +/* $Id: manpath.c,v 1.28 2015/11/07 14:22:29 schwarze Exp $ */ /* * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv> @@ -21,7 +21,9 @@ #include <sys/stat.h> #include <ctype.h> +#if HAVE_ERR #include <err.h> +#endif #include <limits.h> #include <stdio.h> #include <stdlib.h> diff --git a/mansearch.c b/mansearch.c index 756a73f9..9832d577 100644 --- a/mansearch.c +++ b/mansearch.c @@ -1,4 +1,4 @@ -/* $Id: mansearch.c,v 1.61 2015/11/06 21:19:09 schwarze Exp $ */ +/* $Id: mansearch.c,v 1.62 2015/11/07 14:22:29 schwarze Exp $ */ /* * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -21,7 +21,9 @@ #include <sys/types.h> #include <assert.h> +#if HAVE_ERR #include <err.h> +#endif #include <errno.h> #include <fcntl.h> #include <getopt.h> @@ -1,4 +1,4 @@ -/* $Id: read.c,v 1.145 2015/10/30 19:04:16 schwarze Exp $ */ +/* $Id: read.c,v 1.146 2015/11/07 14:22:29 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010-2015 Ingo Schwarze <schwarze@openbsd.org> @@ -26,7 +26,9 @@ #include <assert.h> #include <ctype.h> +#if HAVE_ERR #include <err.h> +#endif #include <errno.h> #include <fcntl.h> #include <stdarg.h> @@ -1,4 +1,4 @@ -/* $Id: soelim.c,v 1.4 2015/05/21 00:18:52 schwarze Exp $ */ +/* $Id: soelim.c,v 1.5 2015/11/07 14:22:29 schwarze Exp $ */ /* * Copyright (c) 2014 Baptiste Daroussin <bapt@FreeBSD.org> * All rights reserved. @@ -29,7 +29,9 @@ #include <sys/types.h> #include <ctype.h> +#if HAVE_ERR #include <err.h> +#endif #include <limits.h> #include <stdio.h> #include <stdlib.h> @@ -1,4 +1,4 @@ -/* $Id: term_ps.c,v 1.78 2015/10/13 22:59:54 schwarze Exp $ */ +/* $Id: term_ps.c,v 1.79 2015/11/07 14:22:29 schwarze Exp $ */ /* * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> @@ -20,7 +20,9 @@ #include <sys/types.h> #include <assert.h> +#if HAVE_ERR #include <err.h> +#endif #include <stdarg.h> #include <stdint.h> #include <stdio.h> |