From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (fantadrom.bsd.lv [local])
	by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 984d270a
	for <source@mdocml.bsd.lv>;
	Sat, 7 Nov 2015 09:22:59 -0500 (EST)
Date: Sat, 7 Nov 2015 09:22:59 -0500 (EST)
Message-Id: <1832547786395176243.enqueue@fantadrom.bsd.lv>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Without HAVE_ERR, don't try to include <err.h>, it probably 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
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>.

Modified Files:
--------------
    mdocml:
        compat_err.c
        compat_stringlist.c
        main.c
        mandoc_aux.c
        mandocdb.c
        manpath.c
        mansearch.c
        read.c
        soelim.c
        term_ps.c

Revision Data
-------------
Index: mansearch.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mansearch.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -Lmansearch.c -Lmansearch.c -u -p -r1.61 -r1.62
--- mansearch.c
+++ mansearch.c
@@ -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>
Index: compat_err.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/compat_err.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -Lcompat_err.c -Lcompat_err.c -u -p -r1.2 -r1.3
--- compat_err.c
+++ compat_err.c
@@ -36,7 +36,6 @@ int dummy;
  * SUCH DAMAGE.
  */
 
-#include <err.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
Index: term_ps.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/term_ps.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -Lterm_ps.c -Lterm_ps.c -u -p -r1.78 -r1.79
--- term_ps.c
+++ term_ps.c
@@ -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>
Index: main.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/main.c,v
retrieving revision 1.255
retrieving revision 1.256
diff -Lmain.c -Lmain.c -u -p -r1.255 -r1.256
--- main.c
+++ main.c
@@ -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>
Index: manpath.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/manpath.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -Lmanpath.c -Lmanpath.c -u -p -r1.27 -r1.28
--- manpath.c
+++ manpath.c
@@ -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>
Index: read.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/read.c,v
retrieving revision 1.145
retrieving revision 1.146
diff -Lread.c -Lread.c -u -p -r1.145 -r1.146
--- read.c
+++ read.c
@@ -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>
Index: mandocdb.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandocdb.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -Lmandocdb.c -Lmandocdb.c -u -p -r1.207 -r1.208
--- mandocdb.c
+++ mandocdb.c
@@ -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
Index: soelim.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/soelim.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -Lsoelim.c -Lsoelim.c -u -p -r1.4 -r1.5
--- soelim.c
+++ soelim.c
@@ -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>
Index: mandoc_aux.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mandoc_aux.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -Lmandoc_aux.c -Lmandoc_aux.c -u -p -r1.8 -r1.9
--- mandoc_aux.c
+++ mandoc_aux.c
@@ -19,7 +19,9 @@
 
 #include <sys/types.h>
 
+#if HAVE_ERR
 #include <err.h>
+#endif
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
Index: compat_stringlist.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/compat_stringlist.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -Lcompat_stringlist.c -Lcompat_stringlist.c -u -p -r1.5 -r1.6
--- compat_stringlist.c
+++ compat_stringlist.c
@@ -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"
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv