===================================================================
RCS file: /cvs/mandoc/preconv.c,v
retrieving revision 1.3
retrieving revision 1.7
diff -u -p -r1.3 -r1.7
--- mandoc/preconv.c	2011/05/26 14:43:07	1.3
+++ mandoc/preconv.c	2014/08/10 23:54:41	1.7
@@ -1,4 +1,4 @@
-/*	$Id: preconv.c,v 1.3 2011/05/26 14:43:07 kristaps Exp $ */
+/*	$Id: preconv.c,v 1.7 2014/08/10 23:54:41 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -14,12 +14,13 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
+#include <sys/types.h>
+#ifdef HAVE_MMAP
 #include <sys/stat.h>
 #include <sys/mman.h>
+#endif
 
 #include <assert.h>
 #include <fcntl.h>
@@ -30,13 +31,9 @@
 
 /* 
  * The read_whole_file() and resize_buf() functions are copied from
- * read.c, including all dependency code (MAP_FILE, etc.).
+ * read.c, including all dependency code.
  */
 
-#ifndef MAP_FILE
-#define	MAP_FILE	0
-#endif
-
 enum	enc {
 	ENC_UTF_8, /* UTF-8 */
 	ENC_US_ASCII, /* US-ASCII */
@@ -137,7 +134,7 @@ conv_utf_8(const struct buf *b)
 
 	/* Quick test for big-endian value. */
 
-	if ( ! (*((char *)(&one))))
+	if ( ! (*((const char *)(&one))))
 		be = 1;
 
 	for (i = b->offs; i < b->sz; i++) {
@@ -244,10 +241,11 @@ static int
 read_whole_file(const char *f, int fd, 
 		struct buf *fb, int *with_mmap)
 {
-	struct stat	 st;
 	size_t		 off;
 	ssize_t		 ssz;
 
+#ifdef	HAVE_MMAP
+	struct stat	 st;
 	if (-1 == fstat(fd, &st)) {
 		perror(f);
 		return(0);
@@ -268,11 +266,11 @@ read_whole_file(const char *f, int fd, 
 	if (S_ISREG(st.st_mode)) {
 		*with_mmap = 1;
 		fb->sz = (size_t)st.st_size;
-		fb->buf = mmap(NULL, fb->sz, PROT_READ, 
-				MAP_FILE|MAP_SHARED, fd, 0);
+		fb->buf = mmap(NULL, fb->sz, PROT_READ, MAP_SHARED, fd, 0);
 		if (fb->buf != MAP_FAILED)
 			return(1);
 	}
+#endif
 
 	/*
 	 * If this isn't a regular file (like, say, stdin), then we must
@@ -376,7 +374,7 @@ cue_enc(const struct buf *b, size_t *offs, enum enc *e
 
 		/* Check us against known encodings. */
 
-		for (i = 0; i < ENC__MAX; i++) {
+		for (i = 0; i < (int)ENC__MAX; i++) {
 			nsz = strlen(encs[i].name);
 			if (phsz < nsz)
 				continue;
@@ -403,7 +401,7 @@ main(int argc, char *argv[])
 	struct buf	 b;
 	const char	*fn;
 	enum enc	 enc, def;
-	const char	 bom[3] = { 0xEF, 0xBB, 0xBF };
+	unsigned char 	 bom[3] = { 0xEF, 0xBB, 0xBF };
 	size_t		 offs;
 	extern int	 optind;
 	extern char	*optarg;
@@ -427,12 +425,12 @@ main(int argc, char *argv[])
 		case ('D'):
 			/* FALLTHROUGH */
 		case ('e'):
-			for (i = 0; i < ENC__MAX; i++) {
+			for (i = 0; i < (int)ENC__MAX; i++) {
 				if (strcasecmp(optarg, encs[i].name))
 					continue;
 				break;
 			}
-			if (i < ENC__MAX) {
+			if (i < (int)ENC__MAX) {
 				if ('D' == ch)
 					def = (enum enc)i;
 				else
@@ -510,9 +508,11 @@ main(int argc, char *argv[])
 
 	rc = EXIT_SUCCESS;
 out:
+#ifdef	HAVE_MMAP
 	if (map)
 		munmap(b.buf, b.sz);
 	else 
+#endif
 		free(b.buf);
 
 	if (fd > STDIN_FILENO)