===================================================================
RCS file: /cvs/mandoc/preconv.c,v
retrieving revision 1.15
retrieving revision 1.17
diff -u -p -r1.15 -r1.17
--- mandoc/preconv.c	2015/10/06 18:32:19	1.15
+++ mandoc/preconv.c	2018/12/13 11:55:47	1.17
@@ -1,4 +1,4 @@
-/*	$Id: preconv.c,v 1.15 2015/10/06 18:32:19 schwarze Exp $ */
+/*	$Id: preconv.c,v 1.17 2018/12/13 11:55:47 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -22,18 +22,21 @@
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
+
 #include "mandoc.h"
+#include "roff.h"
+#include "mandoc_parse.h"
 #include "libmandoc.h"
 
 int
-preconv_encode(struct buf *ib, size_t *ii, struct buf *ob, size_t *oi,
+preconv_encode(const struct buf *ib, size_t *ii, struct buf *ob, size_t *oi,
     int *filenc)
 {
-	unsigned char	*cu;
-	int		 nby;
-	unsigned int	 accum;
+	const unsigned char	*cu;
+	int			 nby;
+	unsigned int		 accum;
 
-	cu = (unsigned char *)ib->buf + *ii;
+	cu = (const unsigned char *)ib->buf + *ii;
 	assert(*cu & 0x80);
 
 	if ( ! (*filenc & MPARSE_UTF8))
@@ -90,7 +93,7 @@ preconv_encode(struct buf *ib, size_t *ii, struct buf 
 	assert(accum < 0xd800 || accum > 0xdfff);
 
 	*oi += snprintf(ob->buf + *oi, 11, "\\[u%.4X]", accum);
-	*ii = (char *)cu - ib->buf;
+	*ii = (const char *)cu - ib->buf;
 	*filenc &= ~MPARSE_LATIN1;
 	return 1;