===================================================================
RCS file: /cvs/mandoc/read.c,v
retrieving revision 1.100
retrieving revision 1.105
diff -u -p -r1.100 -r1.105
--- mandoc/read.c	2014/11/28 06:27:05	1.100
+++ mandoc/read.c	2014/12/16 23:44:41	1.105
@@ -1,4 +1,4 @@
-/*	$Id: read.c,v 1.100 2014/11/28 06:27:05 schwarze Exp $ */
+/*	$Id: read.c,v 1.105 2014/12/16 23:44:41 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -41,7 +41,6 @@
 #include "libmandoc.h"
 #include "mdoc.h"
 #include "man.h"
-#include "main.h"
 
 #define	REPARSE_LIMIT	1000
 
@@ -97,7 +96,6 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"lower case character in document title",
 	"missing manual section, using \"\"",
 	"unknown manual section",
-	"unknown manual volume or arch",
 	"missing date, using today's date",
 	"cannot parse date, using it verbatim",
 	"missing Os macro, using \"\"",
@@ -121,6 +119,7 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 
 	/* related to macros and nesting */
 	"obsolete macro",
+	"macro neither callable nor escaped",
 	"skipping paragraph macro",
 	"moving paragraph macro out of list",
 	"skipping no-space macro",
@@ -146,6 +145,7 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"empty list item",
 	"missing font type, using \\fR",
 	"unknown font type, using \\fR",
+	"nothing follows prefix",
 	"missing -std argument, adding it",
 	"missing eqn box, using \"\"",
 
@@ -188,6 +188,7 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = 
 	"ignore data in cell",
 	"data block still open",
 	"ignoring extra data cells",
+	"ignoring macro in table",
 
 	/* related to document structure and macros */
 	"input stack limit exceeded, infinite loop?",
@@ -755,12 +756,12 @@ mparse_parse_buffer(struct mparse *curp, struct buf bl
 }
 
 enum mandoclevel
-mparse_readmem(struct mparse *curp, const void *buf, size_t len,
+mparse_readmem(struct mparse *curp, void *buf, size_t len,
 		const char *file)
 {
 	struct buf blk;
 
-	blk.buf = UNCONST(buf);
+	blk.buf = buf;
 	blk.sz = len;
 
 	mparse_parse_buffer(curp, blk, file);